proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

1591 files changed, 57440 insertions, 0 deletions

diff --git a/app-text/7plus/7plus-2.25.ebuild b/app-text/7plus/7plus-2.25.ebuild
new file mode 100644
index 000000000000..a40c26a36ea2
--- /dev/null
+++ b/app-text/7plus/7plus-2.25.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+S="${WORKDIR}/7plsrc.${PV//./}"
+DESCRIPTION="An encoder for packet radio"
+HOMEPAGE="http://home.t-online.de/home/dg1bbq/7plus.htm"
+SRC_URI="http://home.t-online.de/home/dg1bbq/7pl${PV//./}sr.tgz"
+
+LICENSE="7plus"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e "s:CC = gcc:CC = $(tc-getCC):" \
+		-e "s:= -O2:+=:" \
+		-e "s:LDFLAGS = -s:LDFLAGS +=:" linux.mak > Makefile \
+		|| die "sed Makefile failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin 7plus || die "dobin failed"
+	dodoc 7pl_hist.nts 7plh_old.nts format.def
+}
diff --git a/app-text/7plus/Manifest b/app-text/7plus/Manifest
new file mode 100644
index 000000000000..a719a5506a62
--- /dev/null
+++ b/app-text/7plus/Manifest
@@ -0,0 +1 @@
+DIST 7pl225sr.tgz 65122 SHA256 2d1f8fdd6e514d7e3fdae55a670555d5d30b31c6b14c59ae7af218af7f923e10 SHA512 c1c303b19ed14b3398a8a0c58eb505f03f27e957cfe3cbf2432db115a1efaf6a637e657490079791d245aebf6d2b14497e111b5d5cfd52637f25f135e5008476 WHIRLPOOL 769a758305a67bbfee56b7b2125725b4a5031d4a8d5047d635b45bd414899a28900b707d9b2a04c198511e4676e122e7b30b547d413b2c92eca9bd33fc6eefa7
diff --git a/app-text/7plus/metadata.xml b/app-text/7plus/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/app-text/7plus/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
new file mode 100644
index 000000000000..d0af23ed3992
--- /dev/null
+++ b/app-text/XML-Schema-learner/Manifest
@@ -0,0 +1,2 @@
+DIST XML-Schema-learner-1.0.0.tar.gz 50690 SHA256 b68fe6c090c3e175e52e0e9f037412eb11725951a54c6a884246fcd2c9465a83 SHA512 aa1b696fbec13d3a345f063e055f77f17832ceb11294a73ac393363684d754f0274ffc59bfc048315bbe2cba8a012cd012ee9ce4f7de12b5695bad60485564bd WHIRLPOOL ddd0afd6056bfa8c617d0a310512d2d4353282f44b8bac140ff299533e689693aa268c189c3c617ecd3e638a00d6994e92e1b6cfa1f8a5c692605f9f12635930
+DIST XML-Schema-learner-1.0.1.tar.gz 51057 SHA256 79e9416db683fee9463ba895283423661e05aa8de2b15c9ea2372c83110ab011 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d WHIRLPOOL 810a51fa5920d46f96e82d018c95e9524dfc85b433fd1579f90a7ff241e6300dc88f166725e68f58a0aac1658fc92ba374da03e3995ed22ba08da23e6003df43
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild
new file mode 100644
index 000000000000..bc7c09624c91
--- /dev/null
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+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/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..b0d391dd48b6
--- /dev/null
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1988ca282eeb
--- /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>
+    <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..89dfac04b50a
--- /dev/null
+++ b/app-text/a2ps/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/a2ps/a2ps-4.14-r3.ebuild b/app-text/a2ps/a2ps-4.14-r3.ebuild
new file mode 100644
index 000000000000..ce3185bbdf62
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools elisp-common eutils flag-o-matic
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="http://www.inf.enst.fr/~demaille/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 ~x86-freebsd ~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() {
+	epatch "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
+	# this will break
+	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
+	use vanilla || epatch "${FILESDIR}"/${PN}-4.13-stdout.diff
+	if use linguas_ja; then
+		epatch "${DISTDIR}"/${P}-ja_nls.patch.gz
+		# bug #335803
+		epatch "${FILESDIR}"/${P}-ja-cleanup.patch
+	else
+		epatch "${FILESDIR}"/${P}-cleanup.patch
+	fi
+
+	# fix fnmatch replacement, bug #134546
+	epatch "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+
+	# bug #122026
+	epatch "${FILESDIR}"/${P}-psset.patch
+
+	# fix emacs printing, bug #114627
+	epatch "${FILESDIR}"/a2ps-4.13c-emacs.patch
+
+	# fix chmod error, #167670
+	epatch "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
+
+	# add configure check for mempcpy, bug 216588
+	epatch "${FILESDIR}"/${P}-check-mempcpy.patch
+
+	# fix compilation error due to invalid stpcpy() prototype, bug 216588
+	epatch "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+
+	# fix compilation error due to obstack.h issue, bug 269638
+	epatch "${FILESDIR}"/${P}-ptrdiff_t.patch
+
+	# fix building with sys-devel/automake >= 1.12, bug 420503
+	rm -f {.,ogonkify}/aclocal.m4
+	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
+
+	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.13c-psset.patch b/app-text/a2ps/files/a2ps-4.13c-psset.patch
new file mode 100644
index 000000000000..f8fd4497f281
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-psset.patch
@@ -0,0 +1,11 @@
+--- a2ps-4.13/contrib/psset.in.orig	2006-03-16 12:30:48.000000000 +0100
++++ a2ps-4.13/contrib/psset.in		2006-03-16 12:28:14.000000000 +0100
+@@ -241,7 +241,7 @@
+ # spaces with a `\' too...
+ pspagedevicelen=`echo "$pspagedevice" | wc -l`
+ pspagedevice=`echo "$pspagedevice" | \
+- sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^/\\\\\\/"`
++ sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^ /\\\\\\/"`
+
+ case $at in
+   0) # Insert last in the Setup, so that we win over other requests.
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/metadata.xml b/app-text/a2ps/metadata.xml
new file mode 100644
index 000000000000..c050a28d58f9
--- /dev/null
+++ b/app-text/a2ps/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
new file mode 100644
index 000000000000..9e3717138a47
--- /dev/null
+++ b/app-text/acroread/Manifest
@@ -0,0 +1 @@
+DIST AdbeRdr9.5.5-1_i486linux_enu.tar.bz2 57127348 SHA256 ee0ea9c65b38abd40ec7c92654e767dc138757f02aef5ae92f74e2dc75ac6540 SHA512 0d60f9c0248432445fb0e6ccbc6d7841ed3e63dad61765436c53098b15c2ede77f1dd6369b04004cec020c20df395f195c4aaf464a6e2761e57a9e9ea0cb5361 WHIRLPOOL 16ae019b3f1bc5b54a31af53e14788223ceed06483563dd4f5fdd7cd7356496188bbd95b04582dd768c4853998706c41cbb5c2b7a9dda99133e712e04b4dba59
diff --git a/app-text/acroread/acroread-9.5.5-r3.ebuild b/app-text/acroread/acroread-9.5.5-r3.ebuild
new file mode 100644
index 000000000000..6cc8deeacfd2
--- /dev/null
+++ b/app-text/acroread/acroread-9.5.5-r3.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+SRC_URI="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}/enu/AdbeRdr${PV}-1_i486linux_enu.tar.bz2"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+
+LICENSE="Adobe"
+KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="html ldap nsplugin"
+# asian fonts from separate package:
+IUSE+=" linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="strip mirror"
+
+DEPEND=""
+RDEPEND="
+	dev-libs/atk[abi_x86_32(-)]
+	dev-libs/glib:2[abi_x86_32(-)]
+	dev-libs/libxml2[abi_x86_32(-)]
+	dev-libs/openssl:0.9.8[abi_x86_32(-)]
+	media-libs/fontconfig[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	>=net-dns/libidn-1.28[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[abi_x86_32(-)]
+	>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/pango[abi_x86_32(-)]
+	|| (
+		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
+		<x11-libs/pango-1.31[X]
+	)
+	nsplugin? ( x11-libs/libXt[abi_x86_32(-)] )
+	ldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)] )
+	x86? ( html? (
+		|| (
+			www-client/firefox-bin
+			www-client/firefox
+			www-client/seamonkey-bin
+			www-client/seamonkey
+		)
+	) )
+	linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
+	linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
+	linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
+	linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
+
+QA_EXECSTACK="
+	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+	opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+	opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api
+"
+QA_FLAGS_IGNORED="
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
+	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
+	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
+	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
+	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
+	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
+	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	opt/netscape/plugins/nppdf.so
+"
+QA_TEXTRELS="
+	opt/Adobe/Reader9/Reader/intellinux/lib/libextendscript.so
+	opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+"
+
+INSTALLDIR=/opt
+
+S="${WORKDIR}/AdobeReader"
+
+# remove bundled libs to force use of system version, bug 340527
+REMOVELIBS="libcrypto libssl"
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	has_multilib_profile && ABI="x86"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# lowercase tar extension required for unpack, bug 476734
+	mv ./ILINXR.TAR ./ILINXR.tar || die
+	mv ./COMMON.TAR ./COMMON.tar || die
+	unpack ./ILINXR.tar ./COMMON.tar
+}
+
+src_prepare() {
+	# remove cruft
+	rm "${S}"/Adobe/Reader9/bin/UNINSTALL
+	rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
+	rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
+
+	# replace some configuration sections
+	for binfile in "${S}"/Adobe/Reader9/bin/* ; do
+		sed -i -e '/Font-config/,+9d' \
+			-e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
+			"${binfile}" || die "sed configuration settings failed."
+	done
+
+	# fix erroneous Exec entry in .desktop
+	sed -i \
+		-e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %F/' \
+		-e 's/^Categories=Application;Office;Viewer;X-Red-Hat-Base;/Categories=Office;Viewer;/' \
+		-e 's/^Caption=/X-Caption=/' \
+		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
+		||die "sed .desktop fix failed"
+
+	# fix braindead error in nppdf.so (bug 412051)
+	sed -i 's#C:\\nppdf32Log\\debuglog\.txt#/dev/null\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00#g' \
+		Adobe/Reader9/Browser/intellinux/nppdf.so || die
+}
+
+src_install() {
+	local LAUNCHER="Adobe/Reader9/bin/acroread"
+
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader9/Resource/Icons/${res}/*
+	done
+
+	dodir /opt
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${ED}"opt/ || die
+
+	# remove some bundled libs
+	for mylib in ${REMOVELIBS}; do
+		einfo Removing bundled ${mylib}
+		rm -v "${ED}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
+	done
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
+
+	if use nsplugin; then
+		inst_plugin /opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	else
+		rm -v "${ED}"/opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	fi
+
+	dodir /opt/bin
+	dosym /opt/${LAUNCHER} /opt/bin/${LAUNCHER/*bin\/}
+
+	# NOTE -- this is likely old and broken and should be removed...
+	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
+	# they don't install a configuration file for libgtkembedmoz.so
+	# detection in /etc/gre.d/ like xulrunner did.
+	if use x86 && use html; then
+		for lib in /opt/{seamonkey,firefox} /usr/lib/{seamonkey,firefox,mozilla-firefox}; do
+			if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+				echo "MOZILLA_COMP_PATH=${lib}" >> "${ED}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+				elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+				elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+				break # don't search any more libraries
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst () {
+	if use x86 && ! use html; then
+		echo
+		ewarn "If you want html support and/or view the Adobe Reader help you have"
+		ewarn "to re-emerge acroread with USE=\"html\"."
+		echo
+	fi
+
+	if use amd64; then
+		if use nsplugin && ! has_version www-plugins/nspluginwrapper; then
+			echo
+			elog "If you're running a 64bit browser you may also want to install"
+			elog "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
+			elog "browser plugin."
+		fi
+		elog ""
+		elog "If you find that Adobe Reader doesn't match your desktop's theme, you"
+		elog "may want to re-emerge the relevant gtk theme package with"
+		elog "USE=\"abi_x86_32\" enabled."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-text/acroread/files/gentoo_config b/app-text/acroread/files/gentoo_config
new file mode 100644
index 000000000000..1ca8729b8b3a
--- /dev/null
+++ b/app-text/acroread/files/gentoo_config
@@ -0,0 +1,10 @@
+# Enable this if you want Adobe Reader to cache Font-config fonts
+ACRO_ENABLE_FONT_CONFIG=1
+export ACRO_ENABLE_FONT_CONFIG
+
+# Enable this if you want to set the MOZILLA_COMP_PATH globally (for all the users)
+if [ -f "$ACRO_INSTALL_DIR/GlobalPrefs/mozilla_config" ]; then
+    . "$ACRO_INSTALL_DIR/GlobalPrefs/mozilla_config"
+   export MOZILLA_COMP_PATH
+fi
+
diff --git a/app-text/acroread/metadata.xml b/app-text/acroread/metadata.xml
new file mode 100644
index 000000000000..a799f700d3b0
--- /dev/null
+++ b/app-text/acroread/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+<use>
+	<flag name="html">HTML support and help reading capability (only for x86).</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/active-dvi/Manifest b/app-text/active-dvi/Manifest
new file mode 100644
index 000000000000..3f849e1a4533
--- /dev/null
+++ b/app-text/active-dvi/Manifest
@@ -0,0 +1 @@
+DIST advi-1.10.2.tar.gz 9772060 SHA256 01556d20896db57c1d05961b2dd48a44d2fbca2adb10d4a9ded732bcf6cb0cc6 SHA512 93479e22261019b571bc331604a659e4e58200284bcdd63929b2c7ab07f8e9fabbd120f8876081a36e7e09e08286eeba9a45f3b077b545a9e404060622ec45c8 WHIRLPOOL 007d4e59c615deeeef0979dff8aca6aa1e088b1542de9076cd2a7f4c4e593a68110249f660c17e50ff25ef20eba5067d1640713fd7c9f44ead19e269c5a8bb47
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..95988ec20122
--- /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
+# $Id$
+
+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() {
+	emake
+	cd doc || die
+	VARTEXFONTS="${T}/fonts" 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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/active-dvi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/adiff/Manifest b/app-text/adiff/Manifest
new file mode 100644
index 000000000000..6a54ac3926c4
--- /dev/null
+++ b/app-text/adiff/Manifest
@@ -0,0 +1 @@
+DIST adiff-1.4 10902 SHA256 c4e56a2a2288e4dc53a824e603d942c59caaebf9b72f01e332a9d98ebfa6df72 SHA512 edbb4d6a8ce8f636a874d22d1e44bc04b860ab31f1e825ce3e865ee3f6bf07fb6a7b9dd44e5429aad21a475d82b34f176d76f8466e58aeca74717740f7054219 WHIRLPOOL 1099775af9d2c5908d8a26cf4277b24ed3ab41b583f83c4bf263f09b190a8c8b68cf6c431219156346fad0848fd40670a93c8cf3c476333e0ec823f319b6b3bc
diff --git a/app-text/adiff/adiff-1.4.ebuild b/app-text/adiff/adiff-1.4.ebuild
new file mode 100644
index 000000000000..02ac8dae1bb1
--- /dev/null
+++ b/app-text/adiff/adiff-1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="wordwise diff"
+HOMEPAGE="http://agriffis.n01se.net/adiff/"
+SRC_URI="${HOMEPAGE}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	!app-arch/atool"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils"
+
+S=${WORKDIR}
+
+src_unpack() {
+	# Nothing to unpack
+	:
+}
+
+src_compile() {
+	pod2man --release=${PV} --center="${HOMEPAGE}" \
+		--date="2007-12-11" "${DISTDIR}"/${P} ${PN}.1 || die
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${PN}
+	doman ${PN}.1
+}
diff --git a/app-text/adiff/metadata.xml b/app-text/adiff/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/app-text/adiff/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest
new file mode 100644
index 000000000000..ccfab3e105e7
--- /dev/null
+++ b/app-text/agrep/Manifest
@@ -0,0 +1 @@
+DIST agrep-2.04.tar.Z 62351 SHA256 31275a2fee28fb8966e1978d26fe8113b61ce49b39e68ddf4cad3964db72d5f8 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee WHIRLPOOL a77870cb9b08512a847acf203d6b5ccad343a9b0bff107d8d768a9d5545c01ecccf860b0e35a9be82a46bbfc5718ba963145016dc8039ab3c157ba0a824316b0
diff --git a/app-text/agrep/agrep-2.04-r1.ebuild b/app-text/agrep/agrep-2.04-r1.ebuild
new file mode 100644
index 000000000000..dee0d55744c2
--- /dev/null
+++ b/app-text/agrep/agrep-2.04-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="agrep is 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/agrep/${P}.tar.Z"
+
+LICENSE="AGREP"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	!dev-libs/tre
+	!app-misc/glimpse"
+
+src_compile() {
+	# Remove first occurace of CFLAGS so we grab the user CFLAGS
+	sed -i -e 's/^CFLAGS.*//' \
+		-e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile || die
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin agrep || die
+	doman agrep.1 || die
+	dodoc README agrep.algorithms agrep.chronicle COPYRIGHT \
+		contribution.list || die
+}
diff --git a/app-text/agrep/agrep-2.04.ebuild b/app-text/agrep/agrep-2.04.ebuild
new file mode 100644
index 000000000000..f7bc2f671725
--- /dev/null
+++ b/app-text/agrep/agrep-2.04.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="agrep is 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/agrep/${P}.tar.Z"
+
+LICENSE="AGREP"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	!dev-libs/tre
+	!app-misc/glimpse"
+
+src_compile() {
+	# Remove first occurace of CFLAGS so we grab the user CFLAGS
+	sed -i -e 's/^CFLAGS.*//' Makefile || die
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin agrep || die
+	doman agrep.1 || die
+	dodoc README agrep.algorithms agrep.chronicle COPYRIGHT \
+		contribution.list || die
+}
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
new file mode 100644
index 000000000000..40149c995561
--- /dev/null
+++ b/app-text/agrep/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>shell-tools</herd>
+</pkgmetadata>
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
new file mode 100644
index 000000000000..8282f2531548
--- /dev/null
+++ b/app-text/aiksaurus/Manifest
@@ -0,0 +1 @@
+DIST aiksaurus-1.2.1.tar.gz 928893 SHA256 1b62cb6351835217f3c229faba3182ba2aa0ab395849bb894dab422976dc8cf4 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463 WHIRLPOOL 8cce9571658bf2419e4f05b01bc8bf7cf45dbca4c2d6a0bcfb458c9ee156940d97eab26fc496002307a145eec99f8b3d9ce0286823b04f16c476cbc23ff1d24a
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..e1d941c8c83e
--- /dev/null
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit flag-o-matic eutils libtool
+
+DESCRIPTION="A thesaurus lib, tool and database"
+HOMEPAGE="http://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 ~x86-freebsd ~amd64-linux ~x86-linux"
+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..70f95901f8de
--- /dev/null
+++ b/app-text/aiksaurus/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>mg_gentoo@yahoo.com</email>
+		<name>Mark Gilbert</name>
+		<description>Third-party maintainer</description>
+	</maintainer>
+	<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..4547983ba924
--- /dev/null
+++ b/app-text/an/Manifest
@@ -0,0 +1 @@
+DIST an_1.2.orig.tar.xz 13196 SHA256 b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d WHIRLPOOL 45f4f39a2560b5db5457ac352d7617d04667f3d3ca17cc6a91172fe479f537ac69723b9e47b2fadc8446b6bf20b81920beb61669370378239361333eeb2de7a1
diff --git a/app-text/an/an-1.2.ebuild b/app-text/an/an-1.2.ebuild
new file mode 100644
index 000000000000..5846a7778995
--- /dev/null
+++ b/app-text/an/an-1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f24deadab0a0
--- /dev/null
+++ b/app-text/an/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>
+  <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..ee2484c6dee0
--- /dev/null
+++ b/app-text/ansifilter/Manifest
@@ -0,0 +1,3 @@
+DIST ansifilter-1.10.tar.bz2 54091 SHA256 a1f513b441ce9e5de1704671ec6bd3ab029ceec3e44368e32a40874c2f50577e SHA512 1fda6fcd7853d295cc3caae696367b3f11ba0aa7301f1e874725d8904012c8b4f433a86db19dc1ee7426469e8e7575a4bcabc7229f3fa9f6ba2adb3a53435e71 WHIRLPOOL 17e4c839c6838fdd91cf00f637f8eba9b7a78ced07a6ce4beba7d36ac91f45963f4209436525154a675050ad6ab3115136d8f94524c0a9d0ad782c9f7289949f
+DIST ansifilter-1.11.tar.bz2 54132 SHA256 fcd550428203225483c4b049b56c5ac3ce786b4863c7eff5ab9b16b141692434 SHA512 db22a6eca7bd580683b9270abb11711c7fbee1b1a17fd710fd880518207a4c65f1df04d21565b22754109dea9a81e9d4fdba0f8e01eb9dac8555041bb83f4acc WHIRLPOOL d961c7e15381bebde1c11182bd38b119596fdadda8afbe019d7227c32546fd74fab2569b444806fb32ede1295f6237f749146410bf490347c519b037755a56d7
+DIST ansifilter-1.7.tar.bz2 133803 SHA256 a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c SHA512 8040f7d9fd48784a64522218491e956678ee13bf75194c5a0e98e2f1acc8fde3cbdc1514125325692d95c4fd5193fa5ededb950cc778a9bacf3c4ac3aca50cb9 WHIRLPOOL 51736aab49de5bcfbe81db9187caba52811aaa3a06f4cf8e4991d00a597e23244c9dbc7ecbdfbb78c1a40c5cdc3770185ec5b2aa42a41885f11e70eda171cc58
diff --git a/app-text/ansifilter/ansifilter-1.10.ebuild b/app-text/ansifilter/ansifilter-1.10.ebuild
new file mode 100644
index 000000000000..c933334d7554
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-1.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2
+
+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="qt4"
+
+RDEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	myopts=(
+		"CC=$(tc-getCXX)"
+		"CFLAGS=${CFLAGS} -c"
+		"LDFLAGS=${LDFLAGS}"
+		"DESTDIR=${ED}"
+		"PREFIX=${EPREFIX}/usr"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	)
+}
+
+src_prepare() {
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_compile() {
+	emake -f makefile "${myopts[@]}"
+	if use qt4 ; then
+		cd src/qt-gui
+		eqmake4
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myopts[@]}" install
+	use qt4 && emake -f makefile "${myopts[@]}" install-gui
+}
diff --git a/app-text/ansifilter/ansifilter-1.11.ebuild b/app-text/ansifilter/ansifilter-1.11.ebuild
new file mode 100644
index 000000000000..c933334d7554
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-1.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2
+
+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="qt4"
+
+RDEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	myopts=(
+		"CC=$(tc-getCXX)"
+		"CFLAGS=${CFLAGS} -c"
+		"LDFLAGS=${LDFLAGS}"
+		"DESTDIR=${ED}"
+		"PREFIX=${EPREFIX}/usr"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	)
+}
+
+src_prepare() {
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_compile() {
+	emake -f makefile "${myopts[@]}"
+	if use qt4 ; then
+		cd src/qt-gui
+		eqmake4
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myopts[@]}" install
+	use qt4 && emake -f makefile "${myopts[@]}" install-gui
+}
diff --git a/app-text/ansifilter/ansifilter-1.7.ebuild b/app-text/ansifilter/ansifilter-1.7.ebuild
new file mode 100644
index 000000000000..36ccf1b66ee2
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-1.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs qt4-r2
+
+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="qt4"
+
+RDEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	myopts=(
+		"CC=$(tc-getCXX)"
+		"CFLAGS=${CFLAGS} -c"
+		"LDFLAGS=${LDFLAGS}"
+		"DESTDIR=${ED}"
+		"PREFIX=${EPREFIX}/usr"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	)
+}
+
+src_prepare() {
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_compile() {
+	emake -f makefile "${myopts[@]}"
+	if use qt4 ; then
+		cd src/qt-gui
+		eqmake4
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myopts[@]}" install
+	use qt4 && emake -f makefile "${myopts[@]}" install-gui
+}
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /dev/null
+++ b/app-text/ansifilter/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>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
new file mode 100644
index 000000000000..7ce28e26fd26
--- /dev/null
+++ b/app-text/antiword/Manifest
@@ -0,0 +1,2 @@
+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
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..08dbb9b81427
--- /dev/null
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	http://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~ppc-aix ~ia64-hpux ~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/files/antiword-0.37-prefix.patch b/app-text/antiword/files/antiword-0.37-prefix.patch
new file mode 100644
index 000000000000..40053696f52e
--- /dev/null
+++ b/app-text/antiword/files/antiword-0.37-prefix.patch
@@ -0,0 +1,71 @@
+--- antiword.h
++++ antiword.h
+@@ -191,43 +191,11 @@
+ #define FONT_SANS_SERIF_ITALIC		"Helvetica-Oblique"
+ #define FONT_SANS_SERIF_BOLDITALIC	"Helvetica-BoldOblique"
+ /* The name of the antiword directories and the font information file */
+-#if defined(__dos)
+-#define GLOBAL_ANTIWORD_DIR	"C:\\antiword"
+-#define ANTIWORD_DIR		"antiword"
+-#define FONTNAMES_FILE		"fontname.txt"
+-#elif defined(__amigaos)
+-#define GLOBAL_ANTIWORD_DIR	"SYS:.antiword"
+-#define ANTIWORD_DIR		".antiword"
+-#define FONTNAMES_FILE		"fontnames"
+-#elif defined(N_PLAT_NLM)
+-#define GLOBAL_ANTIWORD_DIR	"SYS:/antiword"
+-#define ANTIWORD_DIR		"antiword"
+-#define FONTNAMES_FILE		"fontname.txt"
+-#elif defined(__vms)
+-#define GLOBAL_ANTIWORD_DIR	"/usr/share/antiword"
+-#define ANTIWORD_DIR		"antiword"
+-#define FONTNAMES_FILE		"fontnames"
+-#elif defined(__BEOS__)
+-#define GLOBAL_ANTIWORD_DIR	"/boot/home/config/apps/antiword"
+-#define ANTIWORD_DIR		"antiword"
+-#define FONTNAMES_FILE		"fontnames"
+-#elif defined(__CYGMING__)
+-#define GLOBAL_ANTIWORD_DIR	"C:\\antiword"
+-#define ANTIWORD_DIR		"antiword"
+-#define FONTNAMES_FILE		"fontnames"
+-#elif defined(__Plan9__)
+-#define GLOBAL_ANTIWORD_DIR	"/sys/lib/antiword"
+-#define ANTIWORD_DIR		"lib/antiword"
+-#define FONTNAMES_FILE		"fontnames"
+-#elif defined(__sun__)
+-#define GLOBAL_ANTIWORD_DIR	"/usr/local/share/antiword"
++#ifndef GLOBAL_ANTIWORD_DIR
++#error "GLOBAL_ANTIWORD_DIR is unset!"
++#endif
+ #define ANTIWORD_DIR		".antiword"
+ #define FONTNAMES_FILE		"fontnames"
+-#else	/* All others */
+-#define GLOBAL_ANTIWORD_DIR	"/usr/share/antiword"
+-#define ANTIWORD_DIR		".antiword"
+-#define FONTNAMES_FILE		"fontnames"
+-#endif /* __dos */
+ /* The names of grouped mapping files */
+ 	/* ASCII */
+ #define MAPPING_FILE_CP437	"cp437.txt"
+--- Makefile
++++ Makefile
+@@ -36,8 +36,8 @@
+ LOCAL_INSTALL_DIR = $(HOME)/bin
+ LOCAL_RESOURCES_DIR = $(HOME)/.antiword
+ 
+-GLOBAL_INSTALL_DIR = /usr/bin
+-GLOBAL_RESOURCES_DIR = /usr/share/antiword
++GLOBAL_INSTALL_DIR = $(PREFIX)/usr/bin
++GLOBAL_RESOURCES_DIR = $(PREFIX)/usr/share/antiword
+ 
+ all:		$(PROGS)
+ 
+@@ -83,7 +83,7 @@
+ 	@chmod 750 $@
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) '-DGLOBAL_ANTIWORD_DIR="$(GLOBAL_RESOURCES_DIR)"' -c $<
+ 
+ main_u.o:	version.h
+ postscript.o:	version.h
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
new file mode 100644
index 000000000000..aaaf98dcc446
--- /dev/null
+++ b/app-text/antiword/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<maintainer>
+		<email>clabbe.montjoie@gmail.com</email>
+		<name>LABBE Corentin (Montjoie)</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</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..c8581bc1369a
--- /dev/null
+++ b/app-text/antixls/Manifest
@@ -0,0 +1 @@
+DIST antixls-0.3b.perl 4627 SHA256 e08aa669251e215e00769acdfb188071b384cb6be4deb10c7bdc9223b95b6399 SHA512 7e6a6ce26ea8134ee35bab55da73fefc1b211bb58b52468e012abb3ddd0688afea5f3b87b9de49bdb0daff1b6d79b02d4cd6bc2b045a88ff7dc557610ac6fd7f WHIRLPOOL 79da24a5c569b332922eecbf558f4339b426ab38b8d414b3e3bcfd94d2dc42c4e2f8826be592e1ad6a2fbb4acaf286aa5a02d695d4dee93efc69b62e42f891a7
diff --git a/app-text/antixls/antixls-0.3b.ebuild b/app-text/antixls/antixls-0.3b.ebuild
new file mode 100644
index 000000000000..97d9a972bc57
--- /dev/null
+++ b/app-text/antixls/antixls-0.3b.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="It is used to print out an XLS file with minimal formatting, or extracts the data into CSV format"
+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..1470e032181b
--- /dev/null
+++ b/app-text/antixls/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
new file mode 100644
index 000000000000..e5401c3085e6
--- /dev/null
+++ b/app-text/apvlv/Manifest
@@ -0,0 +1,2 @@
+DIST apvlv-0.1.4-Source.tar.gz 337182 SHA256 f803de89aed82fea08f9386a6d6ddec999d0c96bb68c85e4cd527803838d17cd SHA512 798db075e702b02323e4df9f2ed07478aca975feca9ec7cae386792cdb4dbdcf016e7569e8f16bce6ffea0fe5482b5ea8551de10cbd0652f5607e5f0c0ea024b WHIRLPOOL fc9b66d829de17442efe7f782e44dd8024fbaf680a12a260504592bd8a44f48e7d5ace30f18f3ddec4df178fc772f4046ba0fe3e0c100195d86f05bea9703a0a
+DIST apvlv-0.1.5.tar.gz 4254177 SHA256 dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd WHIRLPOOL c254d3ca939b308dc58aadee20e33c5a6bda7495c4521d3433d2eb4a03ab4c9fd25f0589554506b08496f9024ef6d8c8648abc31b5175ad5b181272b9e6cae00
diff --git a/app-text/apvlv/apvlv-0.1.4.ebuild b/app-text/apvlv/apvlv-0.1.4.ebuild
new file mode 100644
index 000000000000..2460cfb5bb99
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+MY_P="${P}-Source"
+DESCRIPTION="Alf's PDF Viewer Like Vim"
+HOMEPAGE="http://naihe2010.github.com/apvlv/"
+SRC_URI="mirror://github/naihe2010/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug djvu"
+
+RDEPEND="
+	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
+	>=x11-libs/gtk+-2.10.4:2
+	djvu? ( app-text/djvu:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Webkit automagic, preserve cflags
+	epatch "${FILESDIR}/${PN}-0.1.4-cmake.patch"
+
+	# Remove prefixes so it works with the cmake-utils eclass
+	sed -i -e "s:APVLV_::" CMakeLists.txt src/CMakeLists.txt || die
+
+	# Don't install tex file
+	sed -i -e "s:Startup.tex::" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR=/etc/${PN}
+		-DDOCDIR=/usr/share/${PN}
+		-DMANDIR=/usr/share/man
+		-DWITH_HTML=OFF
+		-DWITH_UMD=OFF
+		-DWITH_TXT=ON
+		$(cmake-utils_use_with djvu)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS NEWS README THANKS TODO
+	newicon icons/pdf.png ${PN}.png
+	make_desktop_entry ${PN} "Alf's PDF Viewer Like Vim" ${PN} "Office;Viewer"
+}
diff --git a/app-text/apvlv/apvlv-0.1.5.ebuild b/app-text/apvlv/apvlv-0.1.5.ebuild
new file mode 100644
index 000000000000..a06dc571b459
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.1.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils gnome2-utils
+
+DESCRIPTION="Alf's PDF Viewer Like Vim"
+HOMEPAGE="http://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 html"
+
+RDEPEND="
+	>=app-text/poppler-0.18:=[cairo,xpdf-headers(+)]
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	djvu? ( app-text/djvu:= )
+	html? ( net-libs/webkit-gtk:3= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# preserve cflags
+	epatch "${FILESDIR}/${PN}-0.1.5-cflags.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR=/etc/${PN}
+		-DDOCDIR=/usr/share/${PN}
+		-DMANDIR=/usr/share/man
+		$(cmake-utils_use html APVLV_WITH_HTML)
+		-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.4-cmake.patch b/app-text/apvlv/files/apvlv-0.1.4-cmake.patch
new file mode 100644
index 000000000000..43c11596b8b0
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.4-cmake.patch
@@ -0,0 +1,32 @@
+diff -ruN apvlv-0.1.4-Source/src/CMakeLists.txt my/src/CMakeLists.txt
+--- apvlv-0.1.4-Source/src/CMakeLists.txt	2012-06-13 05:44:28.000000000 +0200
++++ my/src/CMakeLists.txt	2012-07-17 00:32:53.782141814 +0200
+@@ -1,23 +1,18 @@
+ IF (WIN32)
+         ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
+ ELSE (WIN32)
+-        SET (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}")
+-        ENDIF (APVLV_ENABLE_DEBUG)
++        SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ ENDIF (WIN32)
+ 
+ FIND_PACKAGE (PkgConfig)
+ 
+-PKG_CHECK_MODULES (FREETYPE2 freetype2 REQUIRED)
+ PKG_CHECK_MODULES (GTK2 gtk+-2.0 REQUIRED)
+ PKG_CHECK_MODULES (GLIB2 glib-2.0 REQUIRED)
+ PKG_CHECK_MODULES (GTHREAD2 gthread-2.0 REQUIRED)
+-PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 QUIET)
++
++IF (APVLV_WITH_HTML)
++    PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 REQUIRED)
++ENDIF (APVLV_WITH_HTML)
+ INCLUDE_DIRECTORIES (${FREETYPE2_INCLUDE_DIRS} 
+                      ${GTK2_INCLUDE_DIRS} 
+                      ${GLIB2_INCLUDE_DIRS} 
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/metadata.xml b/app-text/apvlv/metadata.xml
new file mode 100644
index 000000000000..d1305260168f
--- /dev/null
+++ b/app-text/apvlv/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="html">Build binary with html format support</flag>
+  </use>
+  <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..cfb438d9968c
--- /dev/null
+++ b/app-text/asa/Manifest
@@ -0,0 +1 @@
+DIST asa-1.1.tar.gz 9893 SHA256 7b543dcbd072b8d28ad7ef1fec8104ae574f3efba411ec82eeb2034e9245ac6c SHA512 70452783da23929d9a02cdf9cefd7403698fc8ae703ee5403dd84834b3ac39febf1edc02cb59b233cbdf51cd2f8c04922a77833dd8d851e2106de2e2fe444728 WHIRLPOOL 9179d602d604ec3c7ac2f2603a699ca31169bca6a2f66c0e90d050179821101227eeb35ef8eb46c0b595acdd9d58c8f7f891b498fcb37efe4a50c4bbdc5f1a72
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..3a009fec4363
--- /dev/null
+++ b/app-text/asa/asa-1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/asa-1.1.ebuild b/app-text/asa/asa-1.1.ebuild
new file mode 100644
index 000000000000..180e42d18039
--- /dev/null
+++ b/app-text/asa/asa-1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+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..e50bbf15a5d3
--- /dev/null
+++ b/app-text/asa/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>
+    <email>floppym@gentoo.org</email>
+    <name>Mike Gilbert</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
new file mode 100644
index 000000000000..db04e2f0f033
--- /dev/null
+++ b/app-text/asciidoc/Manifest
@@ -0,0 +1,3 @@
+DIST asciidoc-8.6.5.tar.gz 867402 SHA256 f9da38afaf04186145739c10551341a448b3bf50a37a10392fbe584e9fb2a85f SHA512 bece29540d36a9e071a0746b08ef21a0ecf68a40ae3d593d98dd33d0ab5fcfa85b7895b545b9e5a8e33f78c7ecb142758697decf45e9c2ce26b068ca77c1f2e6 WHIRLPOOL 0c6a85fe848205cbe1b13a8717718b2c6fd6613ded252da13ead4145fdaed5ab763fb5c3c80997e69f39897c3cdd48309e9ef832f36027af75af3381255f22e8
+DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4 SHA512 74c5444124f138862a92a1884b8afe8f968c9a2bbe5a8bbaa9413b0fa4f29fb1ab2eab3c59a68e6c6ddd518866f504e34f43c81406a77c1b2033fbff79df7373 WHIRLPOOL 64a8e20b9718368da7a409cd93ad1906975a09594490982d915146ab721c9b969d714a86318c65e6a328716fbe151d3d2effb012e86a3207fd7717fdbd88ee2c
+DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
diff --git a/app-text/asciidoc/asciidoc-8.6.5.ebuild b/app-text/asciidoc/asciidoc-8.6.5.ebuild
new file mode 100644
index 000000000000..4a1b762a8eb6
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="3.*"
+
+[ "$PV" == "9999" ] && inherit mercurial autotools
+inherit python
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+if [ "$PV" == "9999" ]; then
+	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+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 )
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz )
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		dev-util/aap
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# 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
+		( cd doc && aap -f main.aap ../{CHANGELOG,README,BUGS} )
+	fi
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	emake DESTDIR="${D}" install || die "install failed"
+
+	python_convert_shebangs -r 2 "${D}"
+
+	if use examples; then
+		# This is a symlink to a directory
+		rm examples/website/images || die
+
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples || die
+	fi
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt || die
+}
+
+src_test() {
+	cd tests || die
+	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py update || die
+	ASCIIDOC_PY=../asciidoc.py "$(PYTHON)" test${PN}.py run || die
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
new file mode 100644
index 000000000000..218bab0c9c99
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+[ "$PV" == "9999" ] && inherit mercurial autotools
+inherit python-single-r1
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+if [ "$PV" == "9999" ]; then
+	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+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-python/pygments[${PYTHON_USEDEP}] dev-util/source-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} )
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		dev-util/aap
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# 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
+		cd doc || die
+		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
+	fi
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	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
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+}
+
+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-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
new file mode 100644
index 000000000000..1bf0d2fcc106
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit python-single-r1
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+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-python/pygments[${PYTHON_USEDEP}] dev-util/source-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} )
+"
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# 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() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	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
+	fi
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+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.ebuild b/app-text/asciidoc/asciidoc-8.6.9.ebuild
new file mode 100644
index 000000000000..48bf7151625e
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+[ "$PV" == "9999" ] && inherit mercurial autotools
+inherit python-single-r1
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+if [ "$PV" == "9999" ]; then
+	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+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-python/pygments[${PYTHON_USEDEP}] dev-util/source-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} )
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		dev-util/aap
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# 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
+		cd doc || die
+		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
+	fi
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	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
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+}
+
+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-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
new file mode 100644
index 000000000000..038e1f95e6d0
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+[ "$PV" == "9999" ] && inherit mercurial autotools
+inherit python-single-r1
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+if [ "$PV" == "9999" ]; then
+	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test vim-syntax"
+
+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-python/pygments[${PYTHON_USEDEP}] dev-util/source-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} )
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		dev-util/aap
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+src_prepare() {
+	if ! use vim-syntax; then
+		sed -i -e '/^install/s/install-vim//' Makefile.in || die
+	else
+		sed -i\
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
+			Makefile.in || die
+	fi
+
+	# 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
+		cd doc || die
+		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
+	fi
+}
+
+src_install() {
+	use vim-syntax && dodir /usr/share/vim/vimfiles
+
+	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
+
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+}
+
+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/metadata.xml b/app-text/asciidoc/metadata.xml
new file mode 100644
index 000000000000..5b4dfcac326f
--- /dev/null
+++ b/app-text/asciidoc/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>
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</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..c9946b7a6125
--- /dev/null
+++ b/app-text/aspell/Manifest
@@ -0,0 +1 @@
+DIST aspell-0.60.6.1.tar.gz 1878163 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f WHIRLPOOL 0c77b95a29b598491c12cf22737d5ff758b2758b4f815356d2f52da398afe2b45209cd3b59f90e5b3c1976ee8a09e8cd553507bd93a0cd49043c8531f9a4990b
diff --git a/app-text/aspell/aspell-0.60.6.1-r1.ebuild b/app-text/aspell/aspell-0.60.6.1-r1.ebuild
new file mode 100644
index 000000000000..f5239607b139
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 el en eo es et fi fo fr ga gl he hr is it la
+lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+	dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )"
+	if [[ ${lang} == de ]] ; then
+		dep="linguas_${lang}? (
+			|| (
+				app-dicts/aspell-${lang}
+				app-dicts/aspell-${lang}-alt
+			)
+		)"
+	fi
+	PDEPEND+=" ${dep}"
+	IUSE+=" linguas_${lang}"
+done
+unset dep
+
+COMMON_DEPEND="
+	>=sys-libs/ncurses-5.2
+	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"
+
+	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
+}
+
+pkg_postinst() {
+	elog "In case LINGUAS was not set correctly you may need to install"
+	elog "dictionaries now. Please choose an aspell-<LANG> dictionary or"
+	elog "set LINGUAS correctly and let aspell pull in required packages."
+	elog "After installing an aspell dictionary for your language(s),"
+	elog "You may use the aspell-import utility to import your personal"
+	elog "dictionaries from ispell, pspell and the older aspell"
+}
diff --git a/app-text/aspell/aspell-0.60.6.1-r2.ebuild b/app-text/aspell/aspell-0.60.6.1-r2.ebuild
new file mode 100644
index 000000000000..fb5fd3ebdf9a
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6.1-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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
+	dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )"
+	if [[ ${lang} == de ]] ; then
+		dep="linguas_${lang}? (
+			|| (
+				app-dicts/aspell-${lang}
+				app-dicts/aspell-${lang}-alt
+			)
+		)"
+	fi
+	PDEPEND+=" ${dep}"
+	IUSE+=" linguas_${lang}"
+done
+unset dep
+
+COMMON_DEPEND="
+	>=sys-libs/ncurses-5.2
+	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"
+
+	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/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..fc1920a4f57a
--- /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++
+
+--- prog/check_funs.cpp
++++ 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..39178587f685
--- /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.
+
+--- lib/new_filter.cpp
++++ 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/metadata.xml b/app-text/aspell/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/app-text/aspell/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
new file mode 100644
index 000000000000..b42976e2de4d
--- /dev/null
+++ b/app-text/atril/Manifest
@@ -0,0 +1,2 @@
+DIST atril-1.8.0.tar.xz 1572068 SHA256 99f4f1e100a4eec696feabbb56d653addd8dbe851c9748d2e929e158524c2dad SHA512 054c1391ea3de196a240b1d0b6eb7402a1472475979ff9603396df7f47b32ed681855aff37c379c7e02e814209e6511c8e3fcc8c13c12b795ff6fd7a0ecdca56 WHIRLPOOL 40e3700485c5c018e5369e410fc24bc18ede6b0be6624777c2df59fff0389cec4ca4331514c70b7547782cc4afde3d75f706b232a260fff21dd758805153f335
+DIST atril-1.8.1.tar.xz 1577776 SHA256 036b6bdf9f9caa7468c0cfb680360420cf8477007a0a04dc3b5c50b163c0333f SHA512 1a4a36135a39d216f1cfe5fb91c9d3c16d11da92fbb6b08c314ee09877c7232022a6653649a109ee7a7838a219015f5caab68b2a210399db96f87e4bae520518 WHIRLPOOL 7134a87e8cb3f490677f95f1b05716a4f14e2f8db2bd72d72e9462b061042d9247aca1340b606654aedded43277539c229999198734c4c614842c1aeb2f94fce
diff --git a/app-text/atril/atril-1.8.0.ebuild b/app-text/atril/atril-1.8.0.ebuild
new file mode 100644
index 000000000000..52230e04b249
--- /dev/null
+++ b/app-text/atril/atril-1.8.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ELTCONF="--portage"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Atril document viewer for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps"
+
+RDEPEND=">=app-text/poppler-0.14:0=[cairo]
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.8:0
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.21.5:2[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
+	>=x11-themes/mate-icon-theme-1.8:0
+	caja? ( >=mate-base/caja-1.8:0[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
+	ps? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.0.1: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/intltool-0.35:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_prepare() {
+	# Fix .desktop categories, upstream bug #666346.
+	sed -e "s:GTK\;Graphics\;VectorGraphics\;Viewer\;:GTK\;Office\;Viewer\;Graphics\;VectorGraphics;:g" -i data/atril.desktop.in.in || die
+
+	# Always autoreconf due to lib path conflict.
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+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.
+	gnome2_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-thumbnailer \
+		--with-smclient=xsmp \
+		--with-platform=mate \
+		--with-gtk=2.0 \
+		$(use_enable dbus) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable caja) \
+		$(use_enable ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
+
+DOCS="AUTHORS NEWS README TODO"
diff --git a/app-text/atril/atril-1.8.1.ebuild b/app-text/atril/atril-1.8.1.ebuild
new file mode 100644
index 000000000000..04d0477aab80
--- /dev/null
+++ b/app-text/atril/atril-1.8.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ELTCONF="--portage"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Atril document viewer for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps"
+
+RDEPEND=">=app-text/poppler-0.14:0=[cairo]
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.8:0
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.21.5:2[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
+	>=x11-themes/mate-icon-theme-1.8:0
+	caja? ( >=mate-base/caja-1.8:0[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
+	ps? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.0.1: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/intltool-0.35:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_prepare() {
+	# Fix .desktop categories, upstream bug #666346.
+	sed -e "s:GTK\;Graphics\;VectorGraphics\;Viewer\;:GTK\;Office\;Viewer\;Graphics\;VectorGraphics;:g" -i data/atril.desktop.in.in || die
+
+	# Always autoreconf due to lib path conflict.
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+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.
+	gnome2_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-thumbnailer \
+		--with-smclient=xsmp \
+		--with-platform=mate \
+		--with-gtk=2.0 \
+		$(use_enable dbus) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable caja) \
+		$(use_enable ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
+
+DOCS="AUTHORS NEWS README TODO"
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
new file mode 100644
index 000000000000..d1de444c7661
--- /dev/null
+++ b/app-text/atril/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>mate</herd>
+	<use>
+		<flag name="caja">Enable property page extension in 
+			<pkg>mate-base/mate-file-manager</pkg></flag>
+		<flag name="dvi">Enable build-in DVI viewer</flag>
+		<flag name="ps">Enable build-in postscript viewer</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/libxps</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..c92707c06394
--- /dev/null
+++ b/app-text/bact/Manifest
@@ -0,0 +1 @@
+DIST bact-0.13.tar.gz 230681 SHA256 4aa55c30621afd3793bd15471b3c0d77d3b489051cbfb30a9f0640de8928ab40 SHA512 ba531c41d93e60699d9a06bd1d1df71f6fb1559c1cccd86756a88bcf72279065d3c565cbb1664444cb74fa25a3472d77682419fe9efa8881d73b23f0bcddb9f8 WHIRLPOOL a7157b6600f24c80aaa2dff5db1a8ce74085985b839c59f0020569073a8fb2b879ad2d8df0ea50fa46c62e05bac6d2588de1f8465b7d939677c57f360c6a7dde
diff --git a/app-text/bact/bact-0.13.ebuild b/app-text/bact/bact-0.13.ebuild
new file mode 100644
index 000000000000..98d29fb5500b
--- /dev/null
+++ b/app-text/bact/bact-0.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin bact_learn bact_mkmodel bact_classify
+
+	dohtml index.html bact.css
+	dodoc README AUTHORS
+}
diff --git a/app-text/bact/metadata.xml b/app-text/bact/metadata.xml
new file mode 100644
index 000000000000..0bc446484cc8
--- /dev/null
+++ b/app-text/bact/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..bf8f04590f43
--- /dev/null
+++ b/app-text/barcode/Manifest
@@ -0,0 +1 @@
+DIST barcode-0.98.tar.gz 335658 SHA256 4229e19279b9787ac7e98852fa0bfd93986dce93b9cb07d93a017d68d409b635 SHA512 b2ff43d0c752a9fe7c17d65ef136ff2432ceddd27879c91cb18e46e9b0fc8ed6c174aa4154c0fa6d6e70c478ac86448b8eafa1857bb759159b2eaecc8d6f7ca1 WHIRLPOOL 30bdb0037b5c69e6638175c27f96cce3329934b4febb634c48bd1b3b49cf2b6ef20462bb93432e4b3965f6f9f6a2f3d33d80a3dfa9365d9b69c993403a159327
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..4da85c5fcdfe
--- /dev/null
+++ b/app-text/barcode/barcode-0.98-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="barcode generator"
+HOMEPAGE="http://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/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..01598fe69ee3
--- /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>
+	<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..45027c14bf90
--- /dev/null
+++ b/app-text/bdf2psf/Manifest
@@ -0,0 +1,2 @@
+DIST console-setup_1.104.tar.gz 3272857 SHA256 ad3b4156b4b39f59e5d84d53eaa91858d5b4a36ecbffb3ba6b78151316ebcede SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e WHIRLPOOL e3a83ca20dcc9cfaecfdc075886bb0f7195b38fcfdd43a89d9efc746dff104c6e06f31704ffc2b708f228eb43f4bd76873850d29f3451cc833c31b385dc7dd8d
+DIST console-setup_1.113.tar.xz 1819876 SHA256 d6b3780d084b65d6e907aaa1903860f48c82df2a980d365e1eeb1b2cf118f9f6 SHA512 20b37a9ed404e441efa0760db17e560736484cefe13b5e470bf868cacd6e42fc4659a8d274556e8ad6bd646364eb58e2326010d4c566b210c033071fce4211b8 WHIRLPOOL 0ac3f23492a52d89127667f4a54e31dd2ea325a7f0b78487daeda4047c24ef359081ce763f15df199fd317db396b589d9db1bc2954966ebf91f91f2d69eb7ca2
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
new file mode 100644
index 000000000000..f967e957f37a
--- /dev/null
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.113.ebuild b/app-text/bdf2psf/bdf2psf-1.113.ebuild
new file mode 100644
index 000000000000..43267ae8effd
--- /dev/null
+++ b/app-text/bdf2psf/bdf2psf-1.113.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.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..09ddbff14dbf
--- /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>
+		<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..88df903343fa
--- /dev/null
+++ b/app-text/bibclean/Manifest
@@ -0,0 +1 @@
+DIST bibclean-2.11.4.tar.bz2 1244790 SHA256 cb38bcee5db50efe0135dd0499e2adf75574012467c1c6f72a63799198361225 SHA512 e04f785ca017148600984a852e3093b86eb3ca1c67f41427556d2b08e57e11f05502db5a5beb868a33780a12ee06dc7f5eb9cf794c8f7346cfce582e4761ce14 WHIRLPOOL 59fd63259bfbddb855a571777d840a6562ad9d99788a5e60e822cfdd1baafd544991b5aff8da7078e83f8c54d9ff58cb101531600fd36f423c7dbb633d97f1b4
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..4ee2a5f23d54
--- /dev/null
+++ b/app-text/bibclean/bibclean-2.11.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/bibclean/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
new file mode 100644
index 000000000000..aa37b262db44
--- /dev/null
+++ b/app-text/bibletime/Manifest
@@ -0,0 +1,2 @@
+DIST bibletime-2.10.1.tar.xz 3252680 SHA256 86d2d53913c08bce9f67c0d897639091d84e9d330527636cecd2b9008bf7ca91 SHA512 50f84eb1aefe911f1336ec7a23ea34ade1628383f35dca25330984787221214c0bc0cbc9f88f9540336949df02e76e769b7998d2eef3a15862e3038541564cc9 WHIRLPOOL 2ffc1b1b516d7fa94e842c957dc0be47be5e29ea015fcee2ff291093d0afc201af59d70b055193b420ff3acbc62386980b540eeb63ed92dbd1a741fb68b5be54
+DIST bibletime-2.9.1.tar.bz2 5968979 SHA256 308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5 SHA512 6099e48fc3d54cb8362ec1a3965b372e60fd136d036dfd8d94b5e443ee5f27eb092162b653160bfc71d5366f79af35e22ee40d64ecd681f184bc4e90c1cd9e0a WHIRLPOOL 0677646ce099297321c4a519364b41254544f6d8660d72f9e76b6a8eafd08205915f40aef5bbc6463199ca0d272e28b926b13b0637ecdef1bc822256363cecf2
diff --git a/app-text/bibletime/bibletime-2.10.1.ebuild b/app-text/bibletime/bibletime-2.10.1.ebuild
new file mode 100644
index 000000000000..3ab39bff1aa5
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.10.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt Bible study application using the SWORD library"
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug qt5"
+
+# bug 313657
+# RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.6.0
+	>=dev-cpp/clucene-2.3.3.4
+	qt5? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtwebkit:4
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qttest:5
+	)
+	!qt5? (
+		dev-qt/qttest:4
+	)
+"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+	epatch "${FILESDIR}/${PN}-2.10.1-qt5-printsupport.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_WEBKIT=ON
+	)
+	if use !qt5; then
+		mycmakeargs+=(-DBT_FORCE_USE_QT4=)
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/app-text/bibletime/bibletime-2.9.1.ebuild b/app-text/bibletime/bibletime-2.9.1.ebuild
new file mode 100644
index 000000000000..a71f27691952
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.9.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt4 Bible study application using the SWORD library"
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+# bug 313657
+# RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.6.0
+	>=dev-cpp/clucene-2.3.3.4
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qttest:4"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt;:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_WEBKIT=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch b/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch
new file mode 100644
index 000000000000..203705485409
--- /dev/null
+++ b/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch
@@ -0,0 +1,21 @@
+diff -ruN bibletime-2.10.1-orig/CMakeLists.txt bibletime-2.10.1/CMakeLists.txt
+--- bibletime-2.10.1-orig/CMakeLists.txt	2014-10-14 21:20:59.068697225 -0400
++++ bibletime-2.10.1/CMakeLists.txt	2014-10-14 21:23:20.045693427 -0400
+@@ -172,12 +172,14 @@
+   )
+ 
+   IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
+-    qt5_use_modules("bibletime" Widgets Qml Quick Network)
++      qt5_use_modules("bibletime" Widgets Qml Quick Network PrintSupport)
+   ELSE()
+     IF(BT_Use_DBus)
+-      qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml Network)
++      qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml
++	      Network PrintSupport)
+     ELSE()
+-      qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network)
++      qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network
++	      PrintSupport)
+     ENDIF()
+   ENDIF()
+ ELSE()
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
new file mode 100644
index 000000000000..9d025d57a4a1
--- /dev/null
+++ b/app-text/bibletime/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>theology</herd>
+	<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="sourceforge">bibletime</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
new file mode 100644
index 000000000000..ad03eda7a867
--- /dev/null
+++ b/app-text/bibus/Manifest
@@ -0,0 +1,2 @@
+DIST bibus-1.5.1.tar.gz 4989431 SHA256 1e6e6895124d2ab4147be83f2f87d0b1e78b2786f27345b3d1a3976d13d4c70d SHA512 9181dcc332ea139f31c44c10d084581c2d12ce2333c263eede30f2800e155cdaf0d649a6747cf30d7a259ef172d5370a351c5d747200ae7e5dfe88606f95089c WHIRLPOOL 65d9448b6d3e0ec38932b76d3e7c73ef696b9e00733b65810a1d8f789878e4c0a06378dc00b8e1c881c71c64270b44d50b97370129745dcfcf45a1bdc5b1e175
+DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
diff --git a/app-text/bibus/bibus-1.5.1.ebuild b/app-text/bibus/bibus-1.5.1.ebuild
new file mode 100644
index 000000000000..35f0fd453c01
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH=sqlite
+
+inherit multilib eutils python versionator
+
+DESCRIPTION="Bibliographic and reference management software, integrates with OO.o and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-biblio/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mysql"
+
+# 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="
+	app-office/libreoffice
+	=dev-python/wxpython-2.8*
+	dev-db/sqliteodbc
+	dev-db/unixODBC
+	mysql? (
+		dev-python/mysql-python
+		dev-db/myodbc
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.0-install.patch
+
+	sed \
+		-e "s:gentoo-python:python$(python_get_version):g" \
+		-i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
+		|| die "Failed to adjust python paths"
+
+	# Disable byte-compilation of Python modules.
+	sed -e '/\$(compile)/d' -i Makefile || die "sed failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		oopath="/usr/$(get_libdir)/openoffice/program" \
+		prefix='$(DESTDIR)/usr' \
+		sysconfdir='$(DESTDIR)/etc' \
+		install || die "emake install failed"
+	emake \
+		DESTDIR="${D}" \
+		oopath="/usr/$(get_libdir)/openoffice/program" \
+		prefix='$(DESTDIR)/usr' \
+		sysconfdir='$(DESTDIR)/etc' \
+		install-doc-en || die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize bibus
+}
+
+pkg_postrm() {
+	python_mod_cleanup bibus
+}
diff --git a/app-text/bibus/bibus-1.5.2-r1.ebuild b/app-text/bibus/bibus-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..1cc6cc272cb7
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 L/OO.o and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
+
+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
+}
+
+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_parallel_foreach_impl python_optimize
+
+	python_parallel_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.ebuild b/app-text/bibus/bibus-1.5.2.ebuild
new file mode 100644
index 000000000000..3c398225eb4d
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
+PYTHON_USE_WITH=sqlite
+
+inherit eutils fdo-mime multilib python versionator
+
+DESCRIPTION="Bibliographic and reference management software, integrates with L/OO.o and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql"
+
+# 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="
+	app-office/libreoffice
+	=dev-python/wxpython-2.8*
+	dev-db/sqliteodbc
+	dev-db/unixODBC
+	mysql? (
+		dev-python/mysql-python
+		dev-db/myodbc
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_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
+}
+
+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 -a) \
+			install install-doc-en
+	}
+	python_execute_function installation
+}
+
+pkg_postinst() {
+	python_mod_optimize bibus
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup bibus
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/bibus/files/bibus-1.5.0-install.patch b/app-text/bibus/files/bibus-1.5.0-install.patch
new file mode 100644
index 000000000000..3b2b438d4739
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.0-install.patch
@@ -0,0 +1,262 @@
+diff -Naur bibus-1.5.0/Makefile bibus-1.5.0.new/Makefile
+--- bibus-1.5.0/Makefile	2009-10-08 16:53:13.000000000 -0400
++++ bibus-1.5.0.new/Makefile	2009-11-05 23:33:57.000000000 -0500
+@@ -1,24 +1,25 @@
+ # you presumably will only have to change the three first lines below
+-DESTDIR = /usr/local
++DESTDIR = ${D}usr
+ python = /usr/bin/python
+ oopath = /usr/lib/openoffice/program
+-ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
++ooure = /usr/lib/openoffice/basis-link/ure-link/lib
+ oobasis = /usr/lib/openoffice/basis-link/program
+ #
+ prefix = $(DESTDIR)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ datadir = $(prefix)/share
+-sysconfdir = /etc
++pythondir = $(prefix)/lib/gentoo-python/site-packages
++sysconfdir = ${D}etc
+ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(pythondir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(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 $(pythondir)/bibus/'{}' ';' ;    \
+ 	done
+ 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+@@ -35,41 +36,38 @@
+ 	# 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
+-	# 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
++	ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus
++	chmod 755 $(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 $(datadir)/doc/${PF}
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(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]' > $(pythondir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg
++	echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg
++	echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg
++	echo 'systemconf = /etc/bibus.config' >> $(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 $(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')"
++	# compile recursively all the python files located in $(pythondir)/bibus
++	$(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
++	$(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
+ endef
+ 
+ install-files:
+@@ -85,13 +83,15 @@
+ 
+ 	# 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
++		echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
+ 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+ 	# end uninstaller
+diff -Naur bibus-1.5.0/Setup/Makefile bibus-1.5.0.new/Setup/Makefile
+--- bibus-1.5.0/Setup/Makefile	2009-10-08 16:53:13.000000000 -0400
++++ bibus-1.5.0.new/Setup/Makefile	2009-11-05 22:25:14.000000000 -0500
+@@ -1,24 +1,25 @@
+ # you presumably will only have to change the three first lines below
+-DESTDIR = /usr/local
++DESTDIR = ${D}/usr
+ python = /usr/bin/python
+ oopath = /usr/lib/openoffice/program
+-ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
++ooure = /usr/lib/openoffice/basis-link/ure-link/lib
+ oobasis = /usr/lib/openoffice/basis-link/program
+ #
+ prefix = $(DESTDIR)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ datadir = $(prefix)/share
+-sysconfdir = /etc
++pythondir = $(prefix)/lib/gentoo-python/site-packages
++sysconfdir = ${D}etc
+ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(pythondir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(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 $(pythondir)/bibus/'{}' ';' ; \
+ 	done
+ 	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+@@ -35,41 +36,38 @@
+ 	# 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
+-	# 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
++	ln -sf $(pythondir)/bibus/bibusStart.py $(bindir)/bibus
++	chmod 755 $(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 $(datadir)/doc/${PF}
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(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]' > $(pythondir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(pythondir)/bibus/bibus.cfg
++	echo 'docdir = /usr/share/doc/${PF}/html' >> $(pythondir)/bibus/bibus.cfg
++	echo 'licence = /usr/share/doc/${PF}/copying' >> $(pythondir)/bibus/bibus.cfg
++	echo 'localedir = /usr/share/locale' >> $(pythondir)/bibus/bibus.cfg
++	echo 'systemconf = /etc/bibus.config' >> $(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 $(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')"
++	$(python) -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
++	$(python) -O -c "import compileall ; compileall.compile_dir('$(pythondir)/bibus')"
+ endef
+ 
+ install-files:
+@@ -85,13 +83,15 @@
+ 
+ 	# 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
++		echo "rm -rf /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/lib/gentoo-python/site-packages/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "find /usr/share/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /etc/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/man/man1/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm -rf /usr/share/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
++		echo "rm /usr/share/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
+ 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+ 	# end uninstaller
+diff -Naur bibus-1.5.0/Setup/bibus.cfg bibus-1.5.0.new/Setup/bibus.cfg
+--- bibus-1.5.0/Setup/bibus.cfg	2009-10-08 16:53:13.000000000 -0400
++++ bibus-1.5.0.new/Setup/bibus.cfg	2009-11-05 22:14:50.000000000 -0500
+@@ -1,7 +1,7 @@
+ [PATH]
+ python = /usr/bin/python
+ oopath = /usr/lib/openoffice/program
+-docdir = /usr/local/share/doc/bibus/html
+-licence = /usr/local/share/doc/bibus/copying
+-localedir = /usr/local/share/locale
+-systemconf = /usr/local/etc/bibus.config
++docdir = /usr/share/doc/bibus-1.4.3.2-r1/html
++licence = /usr/share/doc/bibus-1.4.3.2-r1/copying
++localedir = /usr/share/locale
++systemconf = /etc/bibus.config
+diff -Naur bibus-1.5.0/Setup/bibus.sh bibus-1.5.0.new/Setup/bibus.sh
+--- bibus-1.5.0/Setup/bibus.sh	2009-10-08 16:53:13.000000000 -0400
++++ bibus-1.5.0.new/Setup/bibus.sh	2009-11-05 22:14:50.000000000 -0500
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+-export LD_LIBRARY_PATH=/usr/lib/openoffice/program
+-export PYTHONPATH=/usr/lib/openoffice/program
+-exec /usr/bin/python /usr/local/share/bibus/bibus.py
++export LD_LIBRARY_PATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib
++export PYTHONPATH=/usr/lib/openoffice/program:/usr/lib/openoffice/basis-link/program:/usr/lib/openoffice/basis-link/ure-link/lib
++exec /usr/bin/python /usr/lib/gentoo-python/site-packages/bibus/bibus.py
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/metadata.xml b/app-text/bibus/metadata.xml
new file mode 100644
index 000000000000..3786591536b4
--- /dev/null
+++ b/app-text/bibus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<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..5b9a58f707af
--- /dev/null
+++ b/app-text/bibutils/Manifest
@@ -0,0 +1 @@
+DIST bibutils_4.12_src.tgz 447566 SHA256 2f98217a442db8d5532263893aab338535cf17053b79cc8bf82287c6af2060d5 SHA512 04329ecb685bf4d5314c6d3a2d5bb21e67112d73bcb49f5a7808a4082f32a9aecb40add4ec4b5320be35f49cd8e101dc1e35409e7c6cad8c39238d2122f91dd0 WHIRLPOOL c36fd9cba003ef7fcec7c9a004eac7c15eef663f3bebb2bad2483462677b0da893f4670e8fd6ec8a1476278c050d4a17517c4b27221a09a388dd7c4293452c8a
diff --git a/app-text/bibutils/bibutils-4.12.ebuild b/app-text/bibutils/bibutils-4.12.ebuild
new file mode 100644
index 000000000000..2ab6fd8125ec
--- /dev/null
+++ b/app-text/bibutils/bibutils-4.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using a 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..b229aec85b8f
--- /dev/null
+++ b/app-text/bibutils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+</pkgmetadata>
diff --git a/app-text/binfind/Manifest b/app-text/binfind/Manifest
new file mode 100644
index 000000000000..41c6d5e15400
--- /dev/null
+++ b/app-text/binfind/Manifest
@@ -0,0 +1 @@
+DIST binfind-0.0.3.tar.gz 91222 SHA256 1db422fd185d0cdc9915415279952eceef9f426195081b970366a2f0f4dafd78 SHA512 b3a8b72669f701ce54fb3d1c2331262cfc7f396239d14741d3a106c999ef58739a7f33de87da427983ffb641baa7fae4857aa6aab2e1c0748a61d8b913dca3f1 WHIRLPOOL c920a79989db1097f5cf1a4c00001fbc2321cd8ee506abfb4092fcfcdaaed31ad74d6b6e328a4aeba12a30625bcc27b2c62a3b2a25b0a6f9568671c6f6611520
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..f013b1d07087
--- /dev/null
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c6d862855eb5
--- /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>
+  <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..c4624da77536
--- /dev/null
+++ b/app-text/blahtexml/Manifest
@@ -0,0 +1 @@
+DIST blahtexml-0.9-src.tar.gz 168564 SHA256 c5145b02bdf03cd95b7b136de63286819e696639824961d7408bec4591bc3737 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042 WHIRLPOOL 10aed077f16914f2ceff02929069c305a1b6a154e0aafea1c25048b9394c2fddb76cd852c83a1025464e89ecaf7d68d0f552e47818696a0343518fea8deb2852
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
new file mode 100644
index 000000000000..451353f65328
--- /dev/null
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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..bfcb6974f1c4
--- /dev/null
+++ b/app-text/blahtexml/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>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
new file mode 100644
index 000000000000..532e7b2b3714
--- /dev/null
+++ b/app-text/bogosort/Manifest
@@ -0,0 +1 @@
+DIST bogosort-0.4.2.tar.gz 161628 SHA256 bfd66ce866bb8935088873c52323a06997f627a209da1017491425d93e5510ef SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9 WHIRLPOOL 35402daa7555d86327d4bc9534b8d92bd0f34413241b8a24914a7bbf32a2f4c7708ea3e8fcc0420c0ba2b73a6708581df8dbfdaead3da05b77a0a9a72c6bb241
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..6796e5d0d20a
--- /dev/null
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..190b1c47c939
--- /dev/null
+++ b/app-text/bogosort/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <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..d40216585f6b
--- /dev/null
+++ b/app-text/build-docbook-catalog/Manifest
@@ -0,0 +1,2 @@
+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
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..af6ea117440b
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="http://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
+	http://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..3f7e2f60229a
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="http://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
+	http://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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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/files/build-docbook-catalog-1.19.1-no-flock.patch b/app-text/build-docbook-catalog/files/build-docbook-catalog-1.19.1-no-flock.patch
new file mode 100644
index 000000000000..48f054e57a07
--- /dev/null
+++ b/app-text/build-docbook-catalog/files/build-docbook-catalog-1.19.1-no-flock.patch
@@ -0,0 +1,33 @@
+build-docbook-catalog: avoid usage of non-portable flock
+
+Solaris has no flock(1), hence use shell-provided until instead to
+simulate lock.
+
+--- build-docbook-catalog
++++ build-docbook-catalog
+@@ -65,10 +65,14 @@
+ 		mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
+ 	fi
+ 
++	local lock="${ROOT}${ROOTCONFDIR}"/build-docbook-catalog-lock
+ 	(
+ 	# Lock the dir to avoid trashing other runs that might
+ 	# be running parallel.
+-	flock 123 || error "unable to lock ${ROOTCONFDIR}"
++	touch "${lock}".$$ && \
++		until ln "${lock}".$$ "${lock}" 2>/dev/null; do sleep 1; done && \
++		rm "${lock}".$$
++	[[ -f ${lock}.$$ ]] && error "unable to lock ${ROOTCONFDIR}"
+ 
+ 	create_catalogs			# will exit on error
+ 	for type in xsl xsl-ns xsl-saxon xsl-xalan; do
+@@ -90,7 +94,8 @@
+ 		populate_entities
+ 	fi
+ 
+-	) 123>"${ROOT}${ROOTCONFDIR}/.keep"
++	)
++	rm "${lock}"
+ 
+ 	exit 0
+ }
diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/c2ps/Manifest b/app-text/c2ps/Manifest
new file mode 100644
index 000000000000..f6539e3559f9
--- /dev/null
+++ b/app-text/c2ps/Manifest
@@ -0,0 +1 @@
+DIST c2ps-4.0.tar.gz 48137 SHA256 c22800552b6018a7f01978cf918ad11ec780404b3fa87888e76929a08414a860 SHA512 dde931a201950412c8aad04a59f9ca0862b21a221bb7212ee64cbba0193421f1538804525361075be3ed601c5015a0c4e0c3592696f8b545f5a45524b2c5c619 WHIRLPOOL cefaa75a7553020059b05b0dca0b592a8b18632bb88f7b5b6caa7d22f24c8af95f4e30d0610ba1589b684b4904c7deca6339d5f0e2380bf29f25db9566d9f4b7
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
new file mode 100644
index 000000000000..324e8e6e20fd
--- /dev/null
+++ b/app-text/c2ps/c2ps-4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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..1fa0ca569505
--- /dev/null
+++ b/app-text/c2ps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
new file mode 100644
index 000000000000..4cadd17606d9
--- /dev/null
+++ b/app-text/calibre/Manifest
@@ -0,0 +1,6 @@
+DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
+DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b
+DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
+DIST calibre-2.27.0.tar.xz 36776876 SHA256 6567d58a9878f4ad30756c5ce984fe555393fd94167cb23e279c2a83450e2d8e SHA512 0a87549e40f6a3da5489e29fd6969a16ca1e2d8e52ee4d1520ec146b973c3bf4aac73b182b6bb8a0d520137ebe71804543d65ca313ae1560064258c7fa9ff5fa WHIRLPOOL 11f5157c6e1121b68f50f0a923956e6130233aa04790a61ead3dd36ef601cceb15f6d58e5434e0d94cddbbcdc0f9ea84bfb0fa3839752795d8b6271d39679c90
+DIST calibre-2.31.0.tar.xz 37521892 SHA256 7f7e181d3247e41a1122d572a1980fc4ab1926a393aaafe3e26f5345c4602490 SHA512 099450acb2df68800b810ce19d6c8f650b3484d37ebbf30d74f5b26b3724db326d4c4c0d6cc960bd685adfe24e08bc380449b3ee0957275aad76e95fdf60a910 WHIRLPOOL 0673f3caf8c7fd2252d40d2c2a9b5cf886c03afe9a725317031570aaf7f0a8177cb698a34882ba0344de40cdd30826a93f8504d1ef82da88329fee83708b2033
+DIST calibre-2.33.0.tar.xz 37269672 SHA256 0917248454d120f0a3c6c1aec90ad88818ccc1b7747935acce263a272b8b3548 SHA512 1bc63baecd1c1cd3c239b89c102696d39bd7975860bfc3d9fd6cd4bfdbe1e3b81ed6ec40ff3999568d9b0be3fa46efe0490d1c86edf52d67a84fdc7a890e9525 WHIRLPOOL f59ce44f513730675d59fdf42bce4d7c142c39fcd3e148215686604bbf5c9ac18af1dde7f923c25b68edaec6fa3cccce1f4d5066ea7e1c0361491e94e1d6cd93
diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild
new file mode 100644
index 000000000000..97e04cfb5b17
--- /dev/null
+++ b/app-text/calibre/calibre-1.20.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.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 x86"
+SLOT="0"
+IUSE="+udisks"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
+	dev-python/apsw
+	>=dev-python/beautifulsoup-3.0.5:python-2
+	dev-python/netifaces
+	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssselect-0.7.1
+	>=dev-python/cssutils-0.9.9
+	>=dev-python/dbus-python-0.82.2
+	virtual/python-imaging
+	>=dev-python/lxml-2.2.1
+	>=dev-python/mechanize-0.1.11
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/freetype-2:=
+	>=media-libs/libwmf-0.2.8
+	>=media-libs/libmtp-1.1.4:=
+	virtual/libusb:1=
+	dev-qt/qtdbus:4=
+	dev-qt/qtsvg:4=
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5
+	>=virtual/podofo-build-0.8.2"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# 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|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/extensions.py || die "sed failed to patch extensions.py"
+
+	# 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
+	epatch \
+		"${FILESDIR}/${PN}-1.20-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+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}
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	# 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_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+	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
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# 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"
+
+	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
+	rm -r "${ED}"usr/etc/bash_completion.d
+	find "${ED}"usr/etc -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-1.47.ebuild b/app-text/calibre/calibre-1.47.ebuild
new file mode 100644
index 000000000000..0061c4181b76
--- /dev/null
+++ b/app-text/calibre/calibre-1.47.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.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"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)]
+	dev-qt/qtdbus:4=
+	dev-qt/qtsvg:4=
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/freetype-2:=
+	>=media-libs/libwmf-0.2.8
+	>=media-libs/libmtp-1.1.5:=
+	virtual/libusb:1=
+	virtual/python-imaging[python_targets_python2_7(-)]
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5
+	>=virtual/podofo-build-0.8.2"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# 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|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/extensions.py || die "sed failed to patch extensions.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"
+
+	# 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
+	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
+	epatch \
+		"${FILESDIR}/${PN}-1.34-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	# override install path for bash-completions
+	local mybcd="${D}/$(get_bashcompdir)"
+	sed -e "s#^def \(get_bash_completion_path.*\)\$#def \1\n    return os.path.join('${mybcd}','calibre')\n\ndef old_\1#" \
+	  -i "${S}"/src/calibre/linux.py || die "Could not fix bash-completions install path"
+}
+
+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}
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	# 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_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+	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
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# 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"
+
+#	dobashcomp "${ED}"usr/share/bash-completion/completions/calibre
+#	rm -r "${ED}"usr/share/bash-completion
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
new file mode 100644
index 000000000000..dbd132c636ae
--- /dev/null
+++ b/app-text/calibre/calibre-1.48-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 distutils-r1 eutils fdo-mime multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.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"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)]
+	>=dev-libs/chmlib-0.40:=
+	>=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-0.82.2[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-qt/qtdbus:4=
+	dev-qt/qtsvg:4=
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/freetype-2:=
+	>=media-libs/libwmf-0.2.8
+	>=media-libs/libmtp-1.1.5:=
+	virtual/libusb:1=
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+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"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+	# 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
+	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
+	"${FILESDIR}"/${PN}-1.34-no_updates_dialog.patch
+	"${FILESDIR}"/${PN}-disable_plugins.patch
+	)
+
+export_xdg_dirs() {
+	# 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"
+}
+
+python_prepare_all() {
+	# 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|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/extensions.py || die "sed failed to patch extensions.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"
+
+	# override install path for bash-completions
+	local mybcd="${D}/$(get_bashcompdir)"
+	sed -e "s#^def \(get_bash_completion_path.*\)\$#def \1\n    return os.path.join('${mybcd}','calibre')\n\ndef old_\1#" \
+	  -i "${S}"/src/calibre/linux.py || die "Could not fix bash-completions install path"
+
+	tc-export CC CXX
+
+	distutils-r1_python_prepare_all
+}
+
+python_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}
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	# 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
+
+	export_xdg_dirs
+	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	# 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 $(python_get_sitedir) # for init_calibre.py
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	esetup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}"
+}
+
+python_install_all() {
+	export_xdg_dirs
+
+	python_replicate_script "${ED}"/usr/bin/*
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# 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 || die
+	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
+
+	find "${ED}"usr/share -type d -empty -delete || die
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Compiling python modules"
+	python_foreach_impl python_optimize "${ED}"usr/$(get_libdir)/${PN}
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrf2lrs \
+		ebook-meta \
+		ebook-polish \
+		lrfviewer \
+		ebook-viewer \
+		ebook-edit \
+		fetch-ebook-metadata \
+		calibre-smtp \
+		calibre-server \
+		calibre-debug \
+		ebook-device \
+		ebook-convert
+
+}
+
+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-2.27.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild
new file mode 100644
index 000000000000..d17a1202337c
--- /dev/null
+++ b/app-text/calibre/calibre-2.27.0.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.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"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	dev-python/psutil[python_targets_python2_7(-)]
+	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
+	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-imaging[python_targets_python2_7(-)]
+	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
+	>=virtual/podofo-build-0.8.2"
+
+src_prepare() {
+	# 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|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/extensions.py || die "sed failed to patch extensions.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'
+
+	# 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
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+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}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	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}"
+
+	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
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# 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 ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-2.31.0.ebuild b/app-text/calibre/calibre-2.31.0.ebuild
new file mode 100644
index 000000000000..d17a1202337c
--- /dev/null
+++ b/app-text/calibre/calibre-2.31.0.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.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"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	dev-python/psutil[python_targets_python2_7(-)]
+	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
+	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-imaging[python_targets_python2_7(-)]
+	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
+	>=virtual/podofo-build-0.8.2"
+
+src_prepare() {
+	# 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|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/extensions.py || die "sed failed to patch extensions.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'
+
+	# 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
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+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}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	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}"
+
+	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
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# 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 ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-2.33.0.ebuild b/app-text/calibre/calibre-2.33.0.ebuild
new file mode 100644
index 000000000000..0706d00caf41
--- /dev/null
+++ b/app-text/calibre/calibre-2.33.0.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+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"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-lang/python-2.7.9:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	dev-python/psutil[python_targets_python2_7(-)]
+	>=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
+	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-imaging[python_targets_python2_7(-)]
+	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
+	>=virtual/podofo-build-0.8.2"
+
+src_prepare() {
+	# 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|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/extensions.py || die "sed failed to patch extensions.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'
+
+	# 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
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+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}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	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}"
+
+	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
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# 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 ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/files/calibre-1.20-no_updates_dialog.patch b/app-text/calibre/files/calibre-1.20-no_updates_dialog.patch
new file mode 100644
index 000000000000..2ef36874e546
--- /dev/null
+++ b/app-text/calibre/files/calibre-1.20-no_updates_dialog.patch
@@ -0,0 +1,14 @@
+--- calibre.orig/src/calibre/gui2/main.py	2014-01-17 11:49:16.000000000 +0800
++++ calibre/src/calibre/gui2/main.py	2014-01-18 18:28:53.322911344 +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 --git a/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch b/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
new file mode 100644
index 000000000000..dd6b3940f72b
--- /dev/null
+++ b/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
@@ -0,0 +1,37 @@
+--- a/src/calibre/gui2/main.py	2014-01-17 11:49:16.000000000 +0800
++++ b/src/calibre/gui2/main.py	2014-01-18 18:28:53.322911344 +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'))
+--- a/src/calibre/gui2/update.py	2014-04-24 22:02:21.000000000 -0400
++++ b/src/calibre/gui2/update.py	2014-05-01 12:02:27.631316967 -0400
+@@ -139,6 +139,8 @@
+             self.update_checker.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('%s%s%d'%(self.last_newest_calibre_version, VSEP,
+--- a/src/calibre/gui2/ui.py	2014-04-24 22:02:21.000000000 -0400
++++ b/src/calibre/gui2/ui.py	2014-05-01 11:53:58.371307671 -0400
+@@ -858,7 +858,8 @@
+         if write_settings:
+             self.write_settings()
+         self.check_messages_timer.stop()
+-        self.update_checker.terminate()
++        if self.update_checker is not None:
++            self.update_checker.terminate()
+         self.listener.close()
+         self.job_manager.server.close()
+         self.job_manager.threaded_server.close()
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-no_updates_dialog.patch b/app-text/calibre/files/calibre-no_updates_dialog.patch
new file mode 100644
index 000000000000..8fb9ef34807e
--- /dev/null
+++ b/app-text/calibre/files/calibre-no_updates_dialog.patch
@@ -0,0 +1,13 @@
+--- calibre-0.8.60+dfsg.orig/src/calibre/gui2/main.py	2012-07-20 06:26:28.000000000 +0200
++++ calibre-0.8.60+dfsg/src/calibre/gui2/main.py	2012-07-21 17:53:13.944924329 +0200
+@@ -34,8 +34,8 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Log debugging information to console'))
+-    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 --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..7fd9acec49ac
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.init
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+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..9fefdebe04e3
--- /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>
+    <email>axs@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>yngwin@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
new file mode 100644
index 000000000000..8959ce1a582c
--- /dev/null
+++ b/app-text/catdoc/Manifest
@@ -0,0 +1 @@
+DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5
diff --git a/app-text/catdoc/catdoc-0.94.4-r1.ebuild b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
new file mode 100644
index 000000000000..099c9bf5bad1
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOMAKE=none
+
+inherit autotools eutils
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD CREDITS NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
+	epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# only install wordview.desktop when tk is enabled (bug #522766)
+	if ! use tk ; then
+		sed -i 's/ desktop//' Makefile.in || die
+	fi
+
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in
+
+	eautoconf
+}
+
+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() {
+	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install
+
+	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
+
+	dodoc ${DOCS}
+}
diff --git a/app-text/catdoc/catdoc-0.94.4.ebuild b/app-text/catdoc/catdoc-0.94.4.ebuild
new file mode 100644
index 000000000000..183893d208e7
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.94.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOMAKE=none
+
+inherit autotools eutils
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD CREDITS NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
+	epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in
+
+	eautoconf
+}
+
+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() {
+	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install
+
+	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
+
+	dodoc ${DOCS}
+}
diff --git a/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch b/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch
new file mode 100644
index 000000000000..7fc70d33fd9b
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch
@@ -0,0 +1,12 @@
+Index: catdoc-0.94.2/configure.in
+===================================================================
+--- catdoc-0.94.2.orig/configure.in
++++ catdoc-0.94.2/configure.in
+@@ -119,6 +119,6 @@ AC_SUBST(charsetcheck)
+ AC_SUBST(installroot)
+ AC_SUBST(catdoc_version)
+ AC_SUBST(CFLAGS)
+-AC_SUBST(WORDS_BIGENDIAN DEFS)
++AC_SUBST(DEFS)
+ AC_CONFIG_HEADER(src/config.h)
+ AC_OUTPUT(doc/Makefile charsets/Makefile src/Makefile Makefile doc/catdoc.1 doc/xls2csv.1 doc/wordview.1 doc/catppt.1)
diff --git a/app-text/catdoc/files/catdoc-0.94.2-flags.patch b/app-text/catdoc/files/catdoc-0.94.2-flags.patch
new file mode 100644
index 000000000000..eb4e7e469e91
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.94.2-flags.patch
@@ -0,0 +1,35 @@
+Index: catdoc-0.94.2/configure.in
+===================================================================
+--- catdoc-0.94.2.orig/configure.in
++++ catdoc-0.94.2/configure.in
+@@ -100,10 +100,6 @@ AC_C_CONST
+ dnl Checks for library functions.
+ AC_FUNC_SETVBUF_REVERSED
+ 
+-if test "$GCC" = "yes"; then
+-	CFLAGS="-g -O2 -Wall"
+-fi
+-
+ AC_DEFINE_UNQUOTED([SOURCE_CHARSET],"$sourcecharset",[Character encoding used by default for 8-bit source files])
+ AC_DEFINE_UNQUOTED([TARGET_CHARSET],"$targetcharset",[Output character encoding used by default, if impossible to determine encoding from locale])
+ AC_DEFINE_UNQUOTED([SPEC_EXT],"$specsuffix",[Suffix for files with special symbols map (ones to be replaced regardless of availability in target encoding)])
+Index: catdoc-0.94.2/src/Makefile.in
+===================================================================
+--- catdoc-0.94.2.orig/src/Makefile.in
++++ catdoc-0.94.2/src/Makefile.in
+@@ -74,12 +74,12 @@ OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
+ #	$(CC) -c $(CFLAGS) $*
+ all: @buildtargets@
+ catdoc: $(OBJ)
+-	$(CC)  -o catdoc  $(OBJ)
++	$(CC)  $(LDFLAGS) -o catdoc  $(OBJ)
+ xls2csv: $(OBJXLS)
+-	$(CC) -o xls2csv $(OBJXLS) -lm
++	$(CC) $(LDFLAGS) -o xls2csv $(OBJXLS) -lm
+ 
+ catppt: $(OBJPPT)
+-	$(CC) -o catppt $(OBJPPT) -lm
++	$(CC) $(LDFLAGS) -o catppt $(OBJPPT) -lm
+ 
+ install: @installtargets@
+ install-catdoc:catdoc xls2csv catppt 
diff --git a/app-text/catdoc/files/catdoc-0.94.4-desktop.patch b/app-text/catdoc/files/catdoc-0.94.4-desktop.patch
new file mode 100644
index 000000000000..f92792293cea
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.94.4-desktop.patch
@@ -0,0 +1,11 @@
+--- catdoc-0.94.4/desktop/wordview.desktop
++++ catdoc-0.94.4/desktop/wordview.desktop
+@@ -2,7 +2,7 @@
+ Name=Wordview Microsoft doc Viewer
+ Comment=Microsoft doc document file viewer
+ Exec=wordview
+-Icon=wordview.xpm
++Icon=wordview
+ Terminal=false
+ Categories=Office;GNOME;
+ Type=Application
diff --git a/app-text/catdoc/files/catdoc-0.94.4-destdir.patch b/app-text/catdoc/files/catdoc-0.94.4-destdir.patch
new file mode 100644
index 000000000000..9e6ac0986b2a
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.94.4-destdir.patch
@@ -0,0 +1,17 @@
+--- catdoc-0.94.4/desktop/Makefile.in
++++ catdoc-0.94.4/desktop/Makefile.in
+@@ -20,10 +20,10 @@
+ clean:
+ 
+ install: all
+-	../mkinstalldirs $(prefix)$(desktopdir)
+-	../mkinstalldirs $(prefix)$(iconsdir)
+-	$(INSTALL) -m 644 wordview.desktop $(prefix)$(desktopdir)/wordview.desktop
+-	$(INSTALL) -m 644 wordview.xpm $(prefix)$(iconsdir)/wordview.xpm
++	../mkinstalldirs $(installroot)$(prefix)$(desktopdir)
++	../mkinstalldirs $(installroot)$(prefix)$(iconsdir)
++	$(INSTALL) -m 644 wordview.desktop $(installroot)$(prefix)$(desktopdir)/wordview.desktop
++	$(INSTALL) -m 644 wordview.xpm $(installroot)$(prefix)$(iconsdir)/wordview.xpm
+ 
+ distclean: clean
+ 	rm Makefile
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/catdoc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
new file mode 100644
index 000000000000..08532ce5fd9c
--- /dev/null
+++ b/app-text/cb2bib/Manifest
@@ -0,0 +1,2 @@
+DIST cb2bib-1.4.9.tar.gz 853588 SHA256 a12e3f05df5f05e180bc1ff3af8cfcb2fc6142cd2ab7d452706e86a449e1b359 SHA512 95e990772ccb0d789f18dc8b54fc37e432a91e76a7cd6355aa0ddafca5f9cc4d468fc433a50f4006d3eaed35136e9535ae09123a7fd55fbb989fb64234a96308 WHIRLPOOL 65b6b80a689f45a78863450c27e20ec9e5f33a33d32e9fbf7ece370465b77983fcb05c690b962843c9232f5dc6c9bd4dc3fbc7a487573e13348b9b9b15b58de9
+DIST cb2bib-1.5.0.tar.gz 899936 SHA256 e5eae392c9223889fb21c5a656b014d5a81a333c5378196075a985233885f3b9 SHA512 bc1149ebc1dc2f6fb0e2bf04dedc156c2decd5f76a3b57bc24713db5827afb83e5ff2ef4b380d6a4fa6f80ce6375bfa97b2cfdc6d7540f620e3f541a586e998b WHIRLPOOL b4de5b4ad924ae623403070d95d50cbfa378676ed76519d7ec9002c686dd26da6ea8a43531f8c0147c0206a157ca44e9e94c50d53564a78e7a0a098ccb293f53
diff --git a/app-text/cb2bib/cb2bib-1.4.9.ebuild b/app-text/cb2bib/cb2bib-1.4.9.ebuild
new file mode 100644
index 000000000000..f51f07a6cd8a
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.4.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-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"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+IUSE="debug +lzo +webkit"
+
+DEPEND="
+	x11-libs/libX11
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	lzo? ( dev-libs/lzo:2 )
+	webkit? ( dev-qt/qtwebkit:4 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DC2B_USE_LZO=$(use lzo && echo ON || echo OFF)
+		-DC2B_USE_WEBKIT=$(use webkit && echo ON || echo OFF)
+	)
+
+	cmake-utils_src_configure
+}
+
+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/cb2bib-1.5.0.ebuild b/app-text/cb2bib/cb2bib-1.5.0.ebuild
new file mode 100644
index 000000000000..aae6b935a3b8
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-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"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +lzo +webkit"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	x11-libs/libX11
+	lzo? ( dev-libs/lzo:2 )
+	webkit? ( dev-qt/qtwebkit:4 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix desktop files
+	sed -i -e '/Keywords=/ s/$/;/' c2bscripts/{c2bciter,cb2bib}.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DC2B_USE_LZO=$(use lzo && echo ON || echo OFF)
+		-DC2B_USE_WEBKIT=$(use webkit && echo ON || echo OFF)
+	)
+	cmake-utils_src_configure
+}
+
+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..0452c21ae39c
--- /dev/null
+++ b/app-text/cb2bib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<upstream>
+		<bugs-to>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..613b0f29f49b
--- /dev/null
+++ b/app-text/cedilla/Manifest
@@ -0,0 +1 @@
+DIST cedilla-0.6.tar.gz 130676 SHA256 c5840c3e125fab29af844540239dfb475b59c6ecd67270736898608de743df43 SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38 WHIRLPOOL fff84c8c7e2e1c1452dfbaf6bf58d97d405c1f56269cadb0d852ba7c183dec0b73906dfa62ca732e84a7eeb472d4ee2d66adebdd1fc224e56a5c45792a5f1117
diff --git a/app-text/cedilla/cedilla-0.6.ebuild b/app-text/cedilla/cedilla-0.6.ebuild
new file mode 100644
index 000000000000..f9dc5040f2dd
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/files/cedilla-gentoo.patch b/app-text/cedilla/files/cedilla-gentoo.patch
new file mode 100644
index 000000000000..20646d76b9fd
--- /dev/null
+++ b/app-text/cedilla/files/cedilla-gentoo.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=${D}/usr/bin
+ 
+ # Where the cedilla-config.lisp file lives
+-ETCDIR=/etc
++ETCDIR=${D}/etc
+ 
+ # Where Cedilla's FASL files will be kept
+-LIBDIR=/usr/lib/cedilla
++LIBDIR=${D}/usr/lib/cedilla
+ 
+ # Where the cedilla(1) manual page will be installed
+-MANDIR=/usr/share/man/man1
++MANDIR=${D}/usr/share/man/man1
+ 
diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml
new file mode 100644
index 000000000000..9dd77881a9b9
--- /dev/null
+++ b/app-text/cedilla/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>
+	<email>idella4@gentoo.org</email>
+	<name>Ian Delaney</name>
+  </maintainer>
+  <maintainer>
+	<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..b576f80a850e
--- /dev/null
+++ b/app-text/chasen/Manifest
@@ -0,0 +1 @@
+DIST chasen-2.4.4.tar.gz 845720 SHA256 09e41f681097f87ba6c953d3724c34c1826c3cfa590898a2166fb310a006f932 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075 WHIRLPOOL 04c948a703ed720accb2c87c98873407c719456b4e74c43363ebe435329e306f8e28c9b333d2fb709a0fd164c43aa3c333768a5c9aefbf7795dfc7a9c1bbece8
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..3292f52b5b7e
--- /dev/null
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit 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() {
+	emake || die
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	emake check || die
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_test
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_install
+		newdoc README README.perl
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete
+	fi
+}
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..92a7b59f3647
--- /dev/null
+++ b/app-text/chasen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge-jp">chasen-legacy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/chm2pdf/Manifest b/app-text/chm2pdf/Manifest
new file mode 100644
index 000000000000..b987daf67201
--- /dev/null
+++ b/app-text/chm2pdf/Manifest
@@ -0,0 +1 @@
+DIST chm2pdf-0.9.1.tar.gz 19955 SHA256 204293c264c94bd17f56925d21d20b9f69a96136836198ba1a5014fe128ec3b0 SHA512 1d1997b17750f371e60cc6bf9693a8e4316deadd63247700f6ebd1bf02340f2e0524766a6be846d0f6349416b8551609da63fbf60ecd62766cf0d9b4f0c886d3 WHIRLPOOL 15607e84628ea2395b0f55ce0e1c2ab8c41f087e348e453a39db101f21c7e32f533d1537ad79957cf02b4c91f8dc7bf1afa883bf083067f09bbfb0012a373943
diff --git a/app-text/chm2pdf/chm2pdf-0.9.1-r1.ebuild b/app-text/chm2pdf/chm2pdf-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..80aa73116f8b
--- /dev/null
+++ b/app-text/chm2pdf/chm2pdf-0.9.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+PYTHON_DEPEND="2"
+inherit python eutils
+
+DESCRIPTION="A script that converts a CHM file into a single PDF file"
+HOMEPAGE="http://code.google.com/p/chm2pdf/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pychm
+	app-text/htmldoc
+	|| ( >=dev-libs/chmlib-0.40-r1[examples]
+		<dev-libs/chmlib-0.40-r1 )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare(){
+	epatch "${FILESDIR}/tempdir.patch"
+	python_convert_shebangs 2 ${PN}
+}
+
+src_install() {
+	dobin ${PN} || die "failed to create executable"
+	dodoc README || die "dodoc failed"
+}
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..fa7ec2babc00
--- /dev/null
+++ b/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A script that converts a CHM file into a single PDF file"
+HOMEPAGE="http://code.google.com/p/chm2pdf/"
+SRC_URI="http://${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..5751fc881e4b
--- /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>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer>
+		<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..f2d720746c04
--- /dev/null
+++ b/app-text/clara/Manifest
@@ -0,0 +1 @@
+DIST clara-20031214.tar.gz 451539 SHA256 baae846923004ac1b5b91f73057d5faf042eb499434e163b7ab6db88410bbce1 SHA512 260d710132a3903d71b6c4c0885ac1709b60d520861e3dcd5e4b75a3bf5627549c94423670be08245e7a9db6a870a93a9526c8d318fadaddcce00cbf02985f49 WHIRLPOOL 19d229f9e4f391eb7e40d93799467a44de23dc202be012265c6580d08a55f2a4c2fac59323df1ee61798435b763aa0cf73e8425da02cc34cd9009eececadddb6
diff --git a/app-text/clara/clara-20031214.ebuild b/app-text/clara/clara-20031214.ebuild
new file mode 100644
index 000000000000..e94429308344
--- /dev/null
+++ b/app-text/clara/clara-20031214.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_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..ff62877c67ae
--- /dev/null
+++ b/app-text/clara/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>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
new file mode 100644
index 000000000000..1c3b0cdba46f
--- /dev/null
+++ b/app-text/cmigemo/Manifest
@@ -0,0 +1,2 @@
+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
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..2e1675f42a8c
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e7e338e8c1c1
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0821d28aa8f0
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..aef01fc3d591
--- /dev/null
+++ b/app-text/cmigemo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+</pkgmetadata>
diff --git a/app-text/code2html/Manifest b/app-text/code2html/Manifest
new file mode 100644
index 000000000000..77268336b409
--- /dev/null
+++ b/app-text/code2html/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/code2html/code2html-0.9.1-r1.ebuild b/app-text/code2html/code2html-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..696499147eda
--- /dev/null
+++ b/app-text/code2html/code2html-0.9.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+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 ~x86-interix ~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
+}
+
+src_install() {
+	dobin code2html
+	dodoc ChangeLog CREDITS README
+	doman code2html.1
+}
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..3c7e85052e65
--- /dev/null
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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..4a9d1f76cfa3
--- /dev/null
+++ b/app-text/code2html/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>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<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..5b60cae9e384
--- /dev/null
+++ b/app-text/convertlit/Manifest
@@ -0,0 +1 @@
+DIST clit18src.zip 135120 SHA256 d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36 WHIRLPOOL f6cc678fdb4c9b00a5389aa3a2950509c62e5eaf3a9fd14ef38134ae594a583c0d32b0bcd0a940fdc7c5976f0fa160f0fcfb4ae33c5d6251272fc164eee118cb
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..411a44389d52
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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/metadata.xml b/app-text/convertlit/metadata.xml
new file mode 100644
index 000000000000..47df9aaac54a
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+	<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..825f41d8d8ce
--- /dev/null
+++ b/app-text/convmv/Manifest
@@ -0,0 +1,2 @@
+DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc
+DIST convmv-2.0.tar.gz 29534 SHA256 170cf675be1fca77868ff472e9340ca828b1463865a63d4f4b7b3bf4053db93f SHA512 9f452551ab4ea7a45ec4e5d4e4d3c4fdb60cae49f048953d16df9ecd9ee3271c2d6748704f010af6ef312d7ce2079ae9c502e04d936419e29257f68596fc4f58 WHIRLPOOL c907bf99805e2afa7590043a291c7eaa19b681fecf9eb38314d41952edcea381f7e8bf1442226bd9c72122c3b0840e4c376f3947c4b2f65495287155a1353026
diff --git a/app-text/convmv/convmv-1.15-r1.ebuild b/app-text/convmv/convmv-1.15-r1.ebuild
new file mode 100644
index 000000000000..7125bc0f2372
--- /dev/null
+++ b/app-text/convmv/convmv-1.15-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+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() {
+	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-1.15.ebuild b/app-text/convmv/convmv-1.15.ebuild
new file mode 100644
index 000000000000..bd80ade124c8
--- /dev/null
+++ b/app-text/convmv/convmv-1.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils
+
+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() {
+	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install \
+		|| die "einstall failed"
+	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.0.ebuild b/app-text/convmv/convmv-2.0.ebuild
new file mode 100644
index 000000000000..9db5cf978c6c
--- /dev/null
+++ b/app-text/convmv/convmv-2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+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() {
+	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..91c8a805afc2
--- /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>
+    <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..cb40f182e7cc
--- /dev/null
+++ b/app-text/cook/Manifest
@@ -0,0 +1 @@
+DIST cook-1.0.2.tar.gz 139428 SHA256 b56bab9d5227a37c50e94afc65923a579a0c2ef08a23a6fddb611cb4fd1006da SHA512 6941d3541a6cccc18fcbf14128e0593556148d40f74715b0da943455a223099406d632466137fabef27a2083b582701df92666a1ad6e6a04f5d2d3dc0b62e1a1 WHIRLPOOL b16482bfd614247fda8def080fd872945c614ba13f59471ae84f8e9c4997828630b44b2f4e7d87d586e3ba3d4be41721d8906fa9d8d75c879f84079dd6138bcd
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..fa0ccacdc1d7
--- /dev/null
+++ b/app-text/cook/cook-1.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Embedded language which can be used as a macro preprocessor and for similar text processing"
+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..7f98a9b50485
--- /dev/null
+++ b/app-text/cook/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
new file mode 100644
index 000000000000..1352d0ae2f84
--- /dev/null
+++ b/app-text/cpdf/Manifest
@@ -0,0 +1 @@
+DIST cpdf-2.1.1.tar.gz 349536 SHA256 00a3c8b6f1ff60feff7d0b72c095befb576c08edc35ffee28a4d3a24ad599956 SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517 WHIRLPOOL 317af6b976820ddbf3340b75e026f673bd47a7ce4f7de715cd6d71754b1fd403a4fadddffee85023dfd9a6aa44dfeeaf8dfb025784e70d0c33f0418420b80fc3
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..473f15fa3281
--- /dev/null
+++ b/app-text/cpdf/cpdf-2.1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9202b41eeac7
--- /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>
+    <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..244a6f7c771e
--- /dev/null
+++ b/app-text/crf++/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
new file mode 100644
index 000000000000..c1dd5c143f6e
--- /dev/null
+++ b/app-text/crf++/crf++-0.54.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..43455b48df35
--- /dev/null
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+inherit autotools eutils
+
+MY_P="${P/crf/CRF}"
+DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
+HOMEPAGE="http://crfpp.googlecode.com/svn/trunk/doc/index.html"
+SRC_URI="http://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..0b1609859c4e
--- /dev/null
+++ b/app-text/crf++/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<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>
+</pkgmetadata>
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
new file mode 100644
index 000000000000..97b3069c3f96
--- /dev/null
+++ b/app-text/crm114/Manifest
@@ -0,0 +1 @@
+DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 SHA256 fb626472eca43ac2bc03526d49151c5f76b46b92327ab9ee9c9455210b938c2b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6 WHIRLPOOL 8ae6f01d5b7a3d8419662ea9a34a32d25c39f7aea7e35118eb20439f82cbad4d288478ebd87fb521c2871b654a137d4c432a7f7064f918e047b65a69e6be0518
diff --git a/app-text/crm114/crm114-20100106.ebuild b/app-text/crm114/crm114-20100106.ebuild
new file mode 100644
index 000000000000..f406281548f1
--- /dev/null
+++ b/app-text/crm114/crm114-20100106.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+MY_P="${P}-BlameMichelson.src"
+
+inherit eutils toolchain-funcs
+
+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="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}
+
+src_prepare() {
+	sed \
+		-e "s#-O3 -Wall##" \
+		-e "s#^CC=.*#CC=$(tc-getCC)#" \
+		-i Makefile || die
+	# Upstream recommends static linking
+	if ! use static ; then
+		sed -i "s#LDFLAGS += -static -static-libgcc#LDFLAGS += ${LDFLAGS}#" Makefile || die
+	else
+		sed \
+			-e "s#LDFLAGS += -static -static-libgcc#LDFLAGS += ${LDFLAGS} -static -static-libgcc#" \
+			-i Makefile || die
+	fi
+
+	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_install() {
+	dobin crm114 cssutil cssdiff cssmerge || die
+	dobin cssutil cssdiff cssmerge || die
+	dobin osbf-util || die
+
+	dodoc COLOPHON.txt CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt || die
+	dodoc QUICKREF.txt CLASSIFY_DETAILS.txt inoc_passwd.txt || die
+	dodoc KNOWNBUGS.txt THINGS_TO_DO.txt README || die
+	docinto examples
+	dodoc *.example || die
+
+	insinto /usr/share/${PN}
+	doins *.crm || die
+	doins *.cf || die
+	doins *.mfp || die
+}
+
+src_test() {
+	emake megatest || die
+}
+
+pkg_postinst() {
+	elog "The spam-filter CRM files are installed in /usr/share/${PN}."
+}
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
new file mode 100644
index 000000000000..67bc2045feef
--- /dev/null
+++ b/app-text/crm114/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>shell-tools</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+  <email>steev@gentoo.org</email>
+  <name>Steev Klimaszewski</name>
+  <description>Maintainer</description>
+</maintainer>
+<maintainer>
+  <email>pacopablo@pacopablo.com</email>
+  <name>John Hampton</name>
+  <description>Consider him the user-maintainer of this package, and please
+  CC him on bug reports (if he's not the reporter).</description>
+</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>
+</pkgmetadata>
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
new file mode 100644
index 000000000000..7d73df38641e
--- /dev/null
+++ b/app-text/csvfix/Manifest
@@ -0,0 +1,4 @@
+DIST CSVfix_man_html_130.zip 379022 SHA256 a71553bc6c9ff407af203c35a7340851b11133bbfc55398e4a0f2c926a333e1c SHA512 a1201e6318c5c1e0811d5bece740a2b54731f1ebee2d6439fc77fd2655afadd32ecefcb9b8910651c8aa8ed6ae592485d40d25f4c6036c59b470ad55b1fd20f8 WHIRLPOOL 2fc69175bbe0f0662ecd5d6d3a8bf71b1f1ca226c8709525b768d11d1e975d2befd644adbcced869d54250cde876f91ba7dfa116d8a9183abffc238fb05d8ade
+DIST csvfix-1.3.tar.bz2 284900 SHA256 0f00b8aa9ccd7e297b4381c5ca4b129d9df9b7f02166846e98b4ddd7f0d0c99d SHA512 6ddea306ce8147d2b4831bee45238300f26982ae0ae1d2530c5cbf91da517e085b7252b108ab9490add3e7686c9d73f08b2fb4bc2731d01ed711fe1c41f51d18 WHIRLPOOL 6fd4e3284b01e1ce98ee89aa93dd71f4555e25c2411226cc718781d942678cbab1c0214f5966557ae1b9409a2628d614edd5d452a52fed60267afe20842179ad
+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
diff --git a/app-text/csvfix/csvfix-1.3.ebuild b/app-text/csvfix/csvfix-1.3.ebuild
new file mode 100644
index 000000000000..fbd5ef988b9d
--- /dev/null
+++ b/app-text/csvfix/csvfix-1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV="$(delete_all_version_separators)"
+DESCRIPTION="A stream editor for manipulating CSV files"
+HOMEPAGE="http://code.google.com/p/csvfix/"
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.bz2
+	doc? ( http://csvfix.googlecode.com/files/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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${PN}-1.10a-tests.patch
+
+	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
+	use doc && dohtml -r "${WORKDIR}"/${PN}${MY_PV}/*
+}
diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
new file mode 100644
index 000000000000..53d417306e75
--- /dev/null
+++ b/app-text/csvfix/csvfix-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator vcs-snapshot
+
+MY_PV="$(delete_all_version_separators)"
+DESCRIPTION="A stream editor for manipulating CSV files"
+HOMEPAGE="http://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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.10a-tests.patch
+
+	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
+	use doc && dohtml -r "${WORKDIR}"/${PN}${MY_PV}/*
+}
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.3-make.patch b/app-text/csvfix/files/csvfix-1.3-make.patch
new file mode 100644
index 000000000000..33ea0732107d
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.3-make.patch
@@ -0,0 +1,61 @@
+--- csvfix-1.3/alib/Makefile
++++ csvfix-1.3/alib/Makefile
+@@ -2,12 +2,12 @@
+ # Copyright (C) 2009 Neil Butterworth

+ 

+ OUT = lib/alib.a

++AR = ar

+ CC = g++

+ IDIR = inc

+ ODIR = obj

+-XDIR = expat

+ SDIR = src

+-INC = -Iinc -Iexpat

++INC = -Iinc

+ 

+ _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \

+ 		a_expr.o a_myth.o a_inifile.o  a_exec.o \

+@@ -21,9 +21,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 $@ $< 

+ 

+@@ -31,10 +28,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:

+--- csvfix-1.3/csvfix/Makefile
++++ csvfix-1.3/csvfix/Makefile
+@@ -18,7 +18,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 \

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

+ 

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

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

+-	strip $(LINOUT)

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

+ 

+ .PHONY: win

+ win:

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..b3d904bc4881
--- /dev/null
+++ b/app-text/csvfix/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>
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">csvfix</remote-id>
+    <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..48272d2d050e
--- /dev/null
+++ b/app-text/cuneiform/Manifest
@@ -0,0 +1 @@
+DIST cuneiform-linux-1.1.0.tar.bz2 26388511 SHA256 577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56 WHIRLPOOL 90823a056dbf61738fbd8cd7cdd739e32bd571f39bab3ff8e8548cf6359c683a1f0f481cf416292504ee4bb277ed7d5b1edb98f5741a6cf97877cacc2646a70f
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..864c7a4580c4
--- /dev/null
+++ b/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit cmake-utils versionator
+
+PV_MAJ=$(get_version_component_range 1-2)
+MY_P=${PN}-linux-${PV}
+
+DESCRIPTION="An enterprise quality optical character recognition (OCR) engine by Cognitive Technologies"
+HOMEPAGE="https://launchpad.net/cuneiform-linux"
+SRC_URI="http://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug +imagemagick graphicsmagick"
+
+REQUIRED_USE="^^ ( imagemagick graphicsmagick )"
+
+RDEPEND="imagemagick? ( media-gfx/imagemagick )
+		graphicsmagick? ( media-gfx/graphicsmagick )"
+DEPEND=">=dev-util/cmake-2.6.2
+	${RDEPEND}"
+
+DOCS="readme.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare(){
+	epatch "${FILESDIR}/c-assert.diff"
+	epatch "${FILESDIR}/libm.diff"
+	if use graphicsmagick; then
+		epatch "${FILESDIR}/graphicsmagick.diff"
+	fi
+	# respect LDFLAGS
+	sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \
+		"${S}/cuneiform_src/CMakeLists.txt" || die "failed to sed for LDFLAGS"
+	# Fix automagic dependencies / linking
+	if ! use imagemagick; then
+		sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \
+			"${S}/cuneiform_src/CMakeLists.txt" \
+		|| die "Sed for ImageMagick automagic dependency failed."
+	fi
+}
+
+src_install() {
+	#default
+	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..5c81a0d544ac
--- /dev/null
+++ b/app-text/cuneiform/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>yaleks@gentoo.ru</email>
+		<name>Aleksandr Yakimov</name>
+	</maintainer>
+	<maintainer>
+		<email>rich0@gentoo.org</email>
+		<name>Richard Freeman</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cuneiform is an multi-language OCR system.
+	</longdescription>
+	<use>
+		<flag name="imagemagick">Enables support of various input 
+			formats using <pkg>media-gfx/imagemagick</pkg>. 
+			Otherwise only uncompressed BMP files are supported.
+		</flag>
+		<flag name="graphicsmagick">Enables support of various input
+			formats using <pkg>media-gfx/graphicsmagick</pkg>.
+			Otherwise only uncompressed BMP files are supported.
+		</flag>
+	</use>
+	<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..144f8a871779
--- /dev/null
+++ b/app-text/cutemarked/Manifest
@@ -0,0 +1 @@
+DIST cutemarked-0.11.1.tar.gz 759181 SHA256 17f376429bafbd4009099340e71481075f2695a020a7c85a5f91145e168728e8 SHA512 22e1e7825ed0cfbb0480cd73988879dbb89aaf4c6662771e8bd7f5465ceb42cba65f7fa56f114d3b8855ca18f45ee268db4fea94bc92e97195de4e53b9a75139 WHIRLPOOL 99821a99fa3d47ea04f48277b3b35a6211bc772153161b88acecf931bea1e00ba433a2b0ddabb17ad6c29d7395e2b66f6a8e78a9e4f0f1652cf62243e52e881e
diff --git a/app-text/cutemarked/cutemarked-0.11.1.ebuild b/app-text/cutemarked/cutemarked-0.11.1.ebuild
new file mode 100644
index 000000000000..7ce2107ae0b5
--- /dev/null
+++ b/app-text/cutemarked/cutemarked-0.11.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	app-text/discount
+	app-text/hunspell
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/CuteMarkEd-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-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..40433d25c55a
--- /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>
+    <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..24caef79cd91
--- /dev/null
+++ b/app-text/cwtext/Manifest
@@ -0,0 +1 @@
+DIST cwtext-0.96.tar.gz 16596 SHA256 db108e6f510583edf4a285c6d6ab9ab9fdffa3bc5682903b316fd10e1e12393e SHA512 6765c79b6feea2947974bf4654ed1edc83f6c9ddaae1bf37d5ed95dedc4ce9b45d5e41dff7ec50d6586f34901d8f93a3230f1a7e1cf4d52b8a84c851cfbdbd33 WHIRLPOOL eb06efa8c9eb1817431826a5454d417c9440da7e7a8f5ce7a3fd34466d64a2e097140973e31237657b2c88d7b95044e51c9d00568f5217610e5b997f8c6e0a80
diff --git a/app-text/cwtext/cwtext-0.96.ebuild b/app-text/cwtext/cwtext-0.96.ebuild
new file mode 100644
index 000000000000..10504fbe96f2
--- /dev/null
+++ b/app-text/cwtext/cwtext-0.96.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..be87db2d90b7
--- /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>
+		<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..06d4f76f2f24
--- /dev/null
+++ b/app-text/dbacl/Manifest
@@ -0,0 +1 @@
+DIST dbacl-1.14.tar.gz 922969 SHA256 07e795ab4d8ba530d466667409e6a62507ce397bb5bb19e5f1dbc370ba794408 SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9 WHIRLPOOL 1490a4100d79beeb9236093dd93a6236722adf69ccd68c408a41ea5a1e9b6068048038b407b36353c258a6b13298ea141d24dabd36dcc49f7380b8f5d5b58c71
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
new file mode 100644
index 000000000000..37163a6cfe6f
--- /dev/null
+++ b/app-text/dbacl/dbacl-1.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..f5e6780c2a64
--- /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>
+<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/ddir/Manifest b/app-text/ddir/Manifest
new file mode 100644
index 000000000000..3190813cc765
--- /dev/null
+++ b/app-text/ddir/Manifest
@@ -0,0 +1 @@
+DIST ddir-0_p20100323.tar.bz2 15875 SHA256 fb90025d4e5b370a0c0e9564c2655cfa635639b180e6ef91b237bf67d652c566 SHA512 e2f367eef02c14a1d937db71fcd798990975581f6352ffad01894b40aea218f48a22d2aa96660cb1f8876b0720a8e76eacf9a5c87f0ecd2f58cafd5434acccad WHIRLPOOL 19bb6378bb50e8ef233d8f8f34e43b797ce630a8c558284c50ef461d4ad8ad66f2b2089fd5a9c8a11cd97b10e18f97dfed397b83f98162d17bb1bc6b31b52a3e
diff --git a/app-text/ddir/ddir-0_p20100323.ebuild b/app-text/ddir/ddir-0_p20100323.ebuild
new file mode 100644
index 000000000000..ddb0acbdefae
--- /dev/null
+++ b/app-text/ddir/ddir-0_p20100323.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..6c3740b4a98b
--- /dev/null
+++ b/app-text/ddir/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..d06e1dcbc6e8
--- /dev/null
+++ b/app-text/delta/Manifest
@@ -0,0 +1 @@
+DIST delta-2006.08.03.tar.gz 32804 SHA256 38184847a92b01b099bf927dbe66ef88fcfbe7d346a7304eeaad0977cb809ca0 SHA512 3720f164f3721ad06bf5a73e654c70a67d6e7a56d0ce574fb0e8571b33269e56611a909f915bd0ea46434d94206a9548fd99fdef98181efe41e7fb03de75c585 WHIRLPOOL c6b72773d137c824896a54b6994c1b84a562a82e8012fc52dbae08b9e132cdc5737f1fb1ea91631cbaaa700ce37d53c20de78d6e95139bcaa73384064bc58d37
diff --git a/app-text/delta/delta-20060803.ebuild b/app-text/delta/delta-20060803.ebuild
new file mode 100644
index 000000000000..e4d221f17c0a
--- /dev/null
+++ b/app-text/delta/delta-20060803.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b3b3c56d65a2
--- /dev/null
+++ b/app-text/delta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>toolchain</herd>
+	<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..588f0243b589
--- /dev/null
+++ b/app-text/dictd/Manifest
@@ -0,0 +1 @@
+DIST dictd-1.12.1.tar.gz 423870 SHA256 a237f6ecdc854ab10de5145ed42eaa2d9b6d51ffdc495f7daee59b05cc363656 SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b WHIRLPOOL d9f92667c0cb66d893f4f4630cc2dae61dd54b5d96b01d312d83eebd34278ddb11b76c2fcaef40a0b6dcd608d5a542d14c6645c7769893879eb9c229e04c9648
diff --git a/app-text/dictd/dictd-1.12.1-r1.ebuild b/app-text/dictd/dictd-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..2d570fcbf0c5
--- /dev/null
+++ b/app-text/dictd/dictd-1.12.1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils readme.gentoo systemd user
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ http://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 ~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..07b77fdcf1f6
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/dictd.initd
@@ -0,0 +1,78 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3884dbff3e59
--- /dev/null
+++ b/app-text/dictd/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..8f131b1824e0
--- /dev/null
+++ b/app-text/diction/Manifest
@@ -0,0 +1 @@
+DIST diction-1.13.tar.gz 145971 SHA256 095e0eb4bb7e0bdfd7e5b0dcfb53c743d7b24c1464bdd599ef4461b4c249d121 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039 WHIRLPOOL 3a1ac454bde896a7c51511e7ceaf463997a2cb1557b0e7668f027d844a8501cb6a32315cce02b394139a9433b4f08a19180d6ebf08590f136d1414e281a0f1c0
diff --git a/app-text/diction/diction-1.13.ebuild b/app-text/diction/diction-1.13.ebuild
new file mode 100644
index 000000000000..b1d5dbabbe64
--- /dev/null
+++ b/app-text/diction/diction-1.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Diction and style checkers for english and german texts"
+HOMEPAGE="http://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 ~x86-interix ~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..237f17d365d1
--- /dev/null
+++ b/app-text/diction/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<maintainer>
+		<email>jnrowe@gmail.com</email>
+		<name>James Rowe</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..0d9537783a83
--- /dev/null
+++ b/app-text/diffpdf/Manifest
@@ -0,0 +1 @@
+DIST diffpdf-2.1.3.tar.gz 91856 SHA256 c6142ee038a78108397f45b0c456dca7a4fe1d75250f21a514a134101d322433 SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d WHIRLPOOL 3c4b4a90edefc98d208b41cdd35e40438a8e1cbf9177e6f1955cc8819374f223e79fee0d5dbcd55dd4a9ce46cb807d5bf5b7039e1f55e95ae23478ca26dc984d
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..76fbd65e93ea
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e4c38b722575
--- /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>
+	<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..fbc13952a7c0
--- /dev/null
+++ b/app-text/ding/Manifest
@@ -0,0 +1 @@
+DIST ding-1.7.tar.gz 4037214 SHA256 a6546e1074f954c67ff7697b777c42a08528177adfa08700b827c8323eb1eb91 SHA512 580f85d2bc6683666db1d6a3101b0de889725064607e260de39fab3c6de773ba45f39aafd0444edadc1e9b8cee5b8388dc90cefb11bcb9d229e55b62e91dfde5 WHIRLPOOL bf7938ca19d56cd9ba9fc72f543a77de6387797fa04dcf8186eaf0a80551dfc4060628d8b175ee8c7a95b07405ee0cd46b5297b56620dc274540c187e3d3b3bd
diff --git a/app-text/ding/ding-1.7.ebuild b/app-text/ding/ding-1.7.ebuild
new file mode 100644
index 000000000000..6af70e259252
--- /dev/null
+++ b/app-text/ding/ding-1.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+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 || die
+	insinto /usr/share/dict
+	doins de-en.txt || die
+	doman ding.1 || die
+	dodoc CHANGES README || die
+
+	doicon ding.png || die
+	domenu ding.desktop || die
+}
diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/app-text/ding/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
new file mode 100644
index 000000000000..3eb722a08df6
--- /dev/null
+++ b/app-text/discount/Manifest
@@ -0,0 +1,2 @@
+DIST discount-2.1.6.tar.bz2 83823 SHA256 702bb29e17e387f82e40fae062d5e4939bc6fb22dcf53e6109982a5faa110796 SHA512 75e2fcc31f670bab77a3658a684054971998e91ad14743814480a4d24a59285dea1fe922d16c8d1c868250c417963a80282b8fe278021240ba424b840dd4df8e WHIRLPOOL 9f519c44df4bc5300729dd0f51fbcb20f957da68d03b670307bfd51c0d994b5d2b765eac6e17bba8119bb095277ce5dfbad185599bdeca834c4982eb813d7a79
+DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114
diff --git a/app-text/discount/discount-2.1.6-r1.ebuild b/app-text/discount/discount-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..6bcc944acab2
--- /dev/null
+++ b/app-text/discount/discount-2.1.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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() {
+	epatch "${FILESDIR}"/${P}-portage-multilib-CFLAGS.patch
+
+	# 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() {
+	./configure.sh \
+		--libdir="${EPREFIX}"usr/"$(get_libdir)" \
+		--prefix="${EPREFIX}"usr \
+		--mandir="${EPREFIX}"usr/share/man \
+		--shared \
+		$(usex minimal '' --enable-all-features) \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" $(usex minimal install install.everything)
+
+	DISCOUNT_EBUILD_RENAMED_BINARIES=()
+	local bin
+	for bin in "${ED}"usr/bin/*; do
+		[[ ${bin} = */markdown || ${bin} =~ ${PN}[^/]*$ ]] && continue
+		DISCOUNT_EBUILD_RENAMED_BINARIES+=(${bin##*/})
+		mv "${bin}" "${bin%/*}/${PN}-${bin##*/}" || die
+		mv "${ED}"usr/share/man/man1/{,${PN}-}${bin##*/}.1 || die
+	done
+}
+
+pkg_postinst() {
+	if [[ ${DISCOUNT_EBUILD_RENAMED_BINARIES} ]]; then
+		local bin
+		elog "Some discount binaries with overly-generic names have been"
+		elog "prefixed. Please see"
+		elog "https://github.com/Orc/discount/issues/81 for discussion."
+		for bin in "${DISCOUNT_EBUILD_RENAMED_BINARIES[@]}"; do
+			elog "  Renamed '${bin}' to '${PN}-${bin}'."
+		done
+	fi
+}
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..8a570ab5a33f
--- /dev/null
+++ b/app-text/discount/discount-2.1.8a-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/files/discount-2.1.6-portage-multilib-CFLAGS.patch b/app-text/discount/files/discount-2.1.6-portage-multilib-CFLAGS.patch
new file mode 100644
index 000000000000..0abf540cb968
--- /dev/null
+++ b/app-text/discount/files/discount-2.1.6-portage-multilib-CFLAGS.patch
@@ -0,0 +1,58 @@
+From 9b95e9a2dce195a8dfbdbf3206494095b177d405 Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: Thu, 25 Jul 2013 01:14:14 -0400
+Subject: [PATCH] =?UTF-8?q?Fix=20support=20for=20=E2=80=9C$=20CFLAGS=3D-m32=20./configure.sh=E2=80=9D=20by=20using=20CFLAGS=20for=20all=20build=20invokations=20of=20CC.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ Makefile.in |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9bb438a..3bda63d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -64,7 +64,7 @@ $(DESTDIR)$(LIBDIR):
+ 	@INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
+ 
+ version.o: version.c VERSION
+-	$(CC) -DVERSION=\"`cat VERSION`\" -c version.c
++	$(CC) $(CFLAGS) -DVERSION=\"`cat VERSION`\" -c version.c
+ 
+ VERSION:
+ 	@true
+@@ -76,23 +76,23 @@ blocktags: mktags
+ 
+ # example programs
+ @THEME@theme:  theme.o $(MKDLIB) mkdio.h
+-@THEME@	$(CC) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
++@THEME@	$(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
+ 
+ 
+ mkd2html:  mkd2html.o $(MKDLIB) mkdio.h
+-	$(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
+ 
+ markdown: main.o pgm_options.o $(MKDLIB)
+-	$(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
+ 	
+ makepage:  makepage.c pgm_options.o $(MKDLIB) mkdio.h
+-	$(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
++	$(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
+ 
+ pgm_options.o: pgm_options.c mkdio.h config.h
+-	$(CC) -I. -c pgm_options.c
++	$(CC) $(CFLAGS) -I. -c pgm_options.c
+ 
+ main.o: main.c mkdio.h config.h
+-	$(CC) -I. -c main.c
++	$(CC) $(CFLAGS) -I. -c main.c
+ 
+ $(MKDLIB): $(OBJS)
+ 	./librarian.sh make $(MKDLIB) VERSION $(OBJS)
+-- 
+1.7.3.4
+
diff --git a/app-text/discount/metadata.xml b/app-text/discount/metadata.xml
new file mode 100644
index 000000000000..548448307c18
--- /dev/null
+++ b/app-text/discount/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>
+    <email>binki@gentoo.org</email>
+    <name>Nathan Phillip Brink</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
new file mode 100644
index 000000000000..76d83a731a2f
--- /dev/null
+++ b/app-text/djview/Manifest
@@ -0,0 +1,3 @@
+DIST djview-4.10.3.tar.gz 1119618 SHA256 50b80ecddc5aec03c49882c91b3af2f42abfe8454d5ddc01fb313e3481e6ab25 SHA512 6e3da481cec699558cbdca17b19b971d693341e6f5ffc07010f8ba717c6434e6d96969bfc322e4edcaaa5fd364e583c7c0908c814725caad4dcc3dad968a74c5 WHIRLPOOL 54ce8245b13c189a58e3f8171cecd3c1c48e8e56bdae3103b19186627fb002521e3fa25c1e81a49149d8b331fd9636af4badbb0be389d56022cab87ff8f2e60d
+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
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..d0bf4a10cd07
--- /dev/null
+++ b/app-text/djview/djview-4.10.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..821a1e1f9bde
--- /dev/null
+++ b/app-text/djview/djview-4.10.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f609a6bf7db1
--- /dev/null
+++ b/app-text/djview/djview-4.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d15d5065b155
--- /dev/null
+++ b/app-text/djview/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<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..e8342e17f4c4
--- /dev/null
+++ b/app-text/djvu/Manifest
@@ -0,0 +1,2 @@
+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
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..e4efe101312a
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.25.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	if ! has_version app-text/djview; then
+		elog "For djviewer or browser plugin, emerge app-text/djview."
+	fi
+}
+
+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..be1c6c35e06d
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	if ! has_version app-text/djview; then
+		elog "For djviewer or browser plugin, emerge app-text/djview."
+	fi
+}
+
+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..b485c3124aa0
--- /dev/null
+++ b/app-text/djvu/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<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..3b8dfbec7dc8
--- /dev/null
+++ b/app-text/djvusmooth/Manifest
@@ -0,0 +1 @@
+DIST djvusmooth-0.2.14.tar.gz 69086 SHA256 fea9c8e98226d699a7c1f5de9743cf97ef442cc0f4b5fa86c537aeb7075056e3 SHA512 cf1b6e16d660d82a2ba0325425c6d6f8d2ed5826a3e2abd2a74a4ac392e5b6e3807b4a6af3f873b7e53a4801f6edb4fa4442e78c6462f793556349ae7361effc WHIRLPOOL 37ba0e4d831bef9966fb47b676cc02af8c4084bd1c9724926459865eea06044f1a3a1d466f5158abf34eb018bfe9b6fa62aac129af2c5707ea86b8535ef0a86b
diff --git a/app-text/djvusmooth/djvusmooth-0.2.14.ebuild b/app-text/djvusmooth/djvusmooth-0.2.14.ebuild
new file mode 100644
index 000000000000..2f288fce96fb
--- /dev/null
+++ b/app-text/djvusmooth/djvusmooth-0.2.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical editor for DjVu documents"
+HOMEPAGE="http://jwilk.net/software/djvusmooth"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: check with wxpython:2.9
+RDEPEND="dev-python/python-djvulibre[${PYTHON_USEDEP}]
+	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+	x11-themes/hicolor-icon-theme"
+DEPEND=""
diff --git a/app-text/djvusmooth/metadata.xml b/app-text/djvusmooth/metadata.xml
new file mode 100644
index 000000000000..6539822a2f8f
--- /dev/null
+++ b/app-text/djvusmooth/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>
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">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..a7c685426822
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -0,0 +1 @@
+DIST docbook-dsssl-1.79.tar.bz2 277650 SHA256 2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e WHIRLPOOL 3c1f8745878e4c50102aaab2ed29eeb1f2ba0e0b20a7ee7426db85f971f811b744721a3e2468035557a1bcf851e166d199e526e18dfa5f23ad0a3d9e76d071f8
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..b34f695efd49
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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 /usr/share/sgml/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..62f87ab02808
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..1c951818e432
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -0,0 +1,8 @@
+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
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..b33698f3e22f
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbk30"
+DESCRIPTION="Docbook SGML DTD 3.0"
+HOMEPAGE="http://www.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 ~x86-interix ~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..4ffc4440cbde
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbk31"
+DESCRIPTION="Docbook SGML DTD 3.1"
+HOMEPAGE="http://www.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 ~x86-interix ~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..56b4f7658f9e
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbk40"
+DESCRIPTION="Docbook SGML DTD 4.0"
+HOMEPAGE="http://www.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 ~x86-interix ~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..6712fd49dec1
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbk41"
+DESCRIPTION="Docbook SGML DTD 4.1"
+HOMEPAGE="http://www.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 ~x86-interix ~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..833ed4f084b4
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbook-4.2"
+DESCRIPTION="Docbook SGML DTD 4.2"
+HOMEPAGE="http://www.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 ~x86-interix ~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..737a6e4eb0b4
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.3"
+HOMEPAGE="http://www.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 ~x86-interix ~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..bb9cb85c58d6
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog eutils
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.4"
+HOMEPAGE="http://www.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 ~x86-interix ~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..70869216c96a
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils sgml-catalog
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.5"
+HOMEPAGE="http://www.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 ~x86-interix ~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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
new file mode 100644
index 000000000000..471a97f632aa
--- /dev/null
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -0,0 +1 @@
+DIST docbook-utils-0.6.14.tar.gz 124998 SHA256 48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf WHIRLPOOL ca29b3c744e317108c627d1c669b2fec9ccda634c9bbdeed9d0121dbe06f4136a3cb7e29a23c71d8a857df07f7ec623f4549b437cd99f55376a4b6fc8dea76c6
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..47e5596765d8
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://sources.redhat.com/docbook-tools/"
+SRC_URI="ftp://sources.redhat.com/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 ~x86-freebsd ~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..506295e08cd2
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+  <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/docbook-sgml-1.0.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
new file mode 100644
index 000000000000..f4ec94fbc8b1
--- /dev/null
+++ b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
new file mode 100644
index 000000000000..c79bb76fbaa7
--- /dev/null
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -0,0 +1,5 @@
+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
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..55ab2e1b633a
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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..0f8a853dc79e
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~x86-interix ~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..92efbd845a58
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~x86-freebsd ~x86-interix ~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..2b93c9e45148
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~x86-interix ~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..9357de83da78
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~x86-interix ~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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..e3ed67648eeb
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -0,0 +1,3 @@
+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
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..7cc87db8d3d2
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..dade633990db
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8d05224db6aa
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2c0383a3dd81
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..16da1d27e48d
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..90029622bb77
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -0,0 +1 @@
+DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 SHA256 255f67ff33c879e461d7a7550be80477d1bd0b0c3406fa50e9b4037eeb8c598e SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3 WHIRLPOOL d0f875baddea8317eaf6b5a4d1d0e9b3e4a380fada6414a310a88c3a9ea8fc2f502c249a1862e100138030409f1fa0052514b905ba56fa084c3798d78d0a0396
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..153e80a88bb6
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d72a3311e701
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/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>
+		<email>flameeyes@gentoo.org</email>
+	</maintainer>
+	<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..90a76b98ea88
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -0,0 +1 @@
+DIST docbook-xsl-1.78.0.tar.bz2 5011106 SHA256 e43220bfe35cad7eb289291264da472819c4b781173a9a58f72d6e404a1f5923 SHA512 9611e354a8c8e86fa203a0b58356a6229e82f98197a94f9a668c10e10ef3ebb87f468fa03a04292068d1cca5ad31043d78e19981933ee3820910d70ca9e044e2 WHIRLPOOL a2ffba19a2da8c6fc1be9fbdc8ef5b5fc5f13ed8524ffc07bda56b7f986268f45b5c4df2261f6a04c7e12b97aadc2e2a6718268ffe3102aa58589f2db6e6f90c
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild
new file mode 100644
index 000000000000..af418df569a1
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:2.0 ) )"
+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-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml
new file mode 100644
index 000000000000..3d8638761c23
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..f15bd53973e3
--- /dev/null
+++ b/app-text/docbook2X/Manifest
@@ -0,0 +1 @@
+DIST docbook2X-0.8.8.tar.gz 723909 SHA256 4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c WHIRLPOOL 60cf325cbb9dbc7e0edc3a7bc4beb061259b22602efae54335f3828417c593ce7cb4c838eb33d598e1e6c2b2583e93eafbdfab37dba2873f1d8abaa72ed07b95
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..3bf236613527
--- /dev/null
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..2c3cc43124cc
--- /dev/null
+++ b/app-text/docbook2X/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">docbook2x</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
new file mode 100644
index 000000000000..4bfa9704e762
--- /dev/null
+++ b/app-text/docx2txt/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/app-text/docx2txt/docx2txt-1.2.ebuild b/app-text/docx2txt/docx2txt-1.2.ebuild
new file mode 100644
index 000000000000..c91c6e351bf3
--- /dev/null
+++ b/app-text/docx2txt/docx2txt-1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1c559a7c7f7b
--- /dev/null
+++ b/app-text/docx2txt/docx2txt-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1c559a7c7f7b
--- /dev/null
+++ b/app-text/docx2txt/docx2txt-1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2ec4c3325d53
--- /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>
+		<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..ff516858b4b2
--- /dev/null
+++ b/app-text/dos2unix/Manifest
@@ -0,0 +1,3 @@
+DIST dos2unix-6.0.6.tar.gz 339149 SHA256 8abbd4e9a630ef649f5ff359df10786c50b302c1b6515cf99bd787adea23d276 SHA512 6affdcdc34b1f0c8b1bab46ed63af73a62abf80d64b44e951e354d05b420dbdf32a918a1bca5b427120927e1ec3fe5553cf9b7bf000de30d955ff760b6b66e45 WHIRLPOOL dbdf70a0c7dc4b5714184f333c49e438dda22f20cfc8a65ad9dcc662ccc8c01c928097a10e7932d98f398deb408d6168286b86dc550f77c6540806e3e0302d65
+DIST dos2unix-7.2.2.tar.gz 411389 SHA256 9c23907296267fa4ea66e1ee03eb6f6229cf7b64968318d00a77076ae89c2612 SHA512 7fc985f156884aa29d13652d9adfcf6ee34e7aac49f9d2c1b33eb4d5288faa6bc9491594781f9579335862078303e3bdb0b1531cd46531037f596250fdbefcf8 WHIRLPOOL bd049c5c1fbe46e81280b9fc1f9ccbe070462ee5288190a4d0e22bb0ced891d224b6aaaf827ad4589d19527be5818c1b36cdb60b07d8417f4c40f5b72c108725
+DIST dos2unix-7.2.3.tar.gz 413524 SHA256 8039ea97a9fc3b0bffed0218099aeb078ebb550127fa6c10e2647aad52669c83 SHA512 8b999538d99cbcc2e08ceb7bee13f0b6bc382e01c3d769f07c8b7c908398ae43d6ef164e7247aa4193686ff9fecb7fce3be22f53321b4ef06ebf7a1639619b6c WHIRLPOOL c9fd92b3d3c4e034211bd553402637ce32f05146a04de27e4f21dc3b7e03330d2339b215fb93d10a7478c55b31906b8e16834a72a788bb43d93f48760a830be8
diff --git a/app-text/dos2unix/dos2unix-6.0.6.ebuild b/app-text/dos2unix/dos2unix-6.0.6.ebuild
new file mode 100644
index 000000000000..b1c772174d04
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-6.0.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://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"
+
+RDEPEND="
+	!app-text/hd2u
+	!app-text/unix2dos
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-lang/perl"
+
+src_prepare() {
+	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 && 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.2.2.ebuild b/app-text/dos2unix/dos2unix-7.2.2.ebuild
new file mode 100644
index 000000000000..d306a53c1d08
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.2.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://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
+	!app-text/unix2dos
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+src_prepare() {
+	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 && 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.2.3.ebuild b/app-text/dos2unix/dos2unix-7.2.3.ebuild
new file mode 100644
index 000000000000..d306a53c1d08
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.2.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://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
+	!app-text/unix2dos
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+src_prepare() {
+	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 && 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..60f3692a5779
--- /dev/null
+++ b/app-text/dos2unix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>shell-tools</herd>
+	<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..5d7e61f22edc
--- /dev/null
+++ b/app-text/duali/Manifest
@@ -0,0 +1 @@
+DIST duali-0.2.0.tar.bz2 13334 SHA256 898045bb4d36e9d4e2292c8e308ccd483dad47115ccb107cdfa41a9b9a46472a SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30 WHIRLPOOL 3c2e3bd136a6353cd126c2aa30db5d73739d9dcc88fc4ea9d11574833135eb2ba145696cb835f1752045dab5c7458fc5dd51ea6f4d050e32893b6d00fe0f400b
diff --git a/app-text/duali/duali-0.2.0.ebuild b/app-text/duali/duali-0.2.0.ebuild
new file mode 100644
index 000000000000..4c2435432d94
--- /dev/null
+++ b/app-text/duali/duali-0.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python
+
+DESCRIPTION="Arabic dictionary based on the DICT protocol"
+HOMEPAGE="http://www.arabeyes.org/project.php?proj=Duali"
+SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+PDEPEND="app-dicts/duali-data"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_install() {
+	dobin duali dict2db trans2arabic arabic2trans
+	python_convert_shebangs -r 2 "${ED}usr/bin"
+
+	insinto /etc
+	doins duali.conf
+
+	doman doc/man/*
+
+	installation() {
+		insinto $(python_get_sitedir)/pyduali
+		doins pyduali/*.py
+	}
+	python_execute_function installation
+
+	dodoc README ChangeLog INSTALL MANIFEST
+}
+
+pkg_postinst() {
+	python_mod_optimize pyduali
+}
+
+pkg_postrm() {
+	python_mod_cleanup pyduali
+}
diff --git a/app-text/duali/metadata.xml b/app-text/duali/metadata.xml
new file mode 100644
index 000000000000..d493cf9e4e54
--- /dev/null
+++ b/app-text/duali/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>
+		<email>maintainer-needed@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+	<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..30962f16cb64
--- /dev/null
+++ b/app-text/dvibook/Manifest
@@ -0,0 +1 @@
+DIST dvibook-20001129.tar.gz 141312 SHA256 d0217d94ecc8c15f4d5aafe94d63e26de5957882a14ea4bdd95f518bd31f125d SHA512 7d9991d8d870951f3e68a5b931ea05466b85dd5b23c5f62ebe3e4c2ddc0650677a0e65f506b7b66938f297a95200879cdbe3370e3e3a92b68bab1b671923d590 WHIRLPOOL fb5251b7f072d26201099674fb5509288bbec6629646810551ea1b1a56665a530ba1779edd56e16e19021d1843664c4e16be27a7bb79189f7d906f27e84b1439
diff --git a/app-text/dvibook/dvibook-20001129.ebuild b/app-text/dvibook/dvibook-20001129.ebuild
new file mode 100644
index 000000000000..7bd5977e70ac
--- /dev/null
+++ b/app-text/dvibook/dvibook-20001129.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+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}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}.patch
+}
+
+src_compile() {
+	xmkmf -a || die "xmkmf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install install.man || die
+
+	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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/dvibook/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/dvipdfm/Manifest b/app-text/dvipdfm/Manifest
new file mode 100644
index 000000000000..97d09053715d
--- /dev/null
+++ b/app-text/dvipdfm/Manifest
@@ -0,0 +1 @@
+DIST dvipdfm-0.13.2d.tar.gz 236898 SHA256 fc21d4ef316fdd28cce7ce64a9ed3d2254ea1969380a5f52d131ec61d5fb73bc SHA512 f983c64d41920a0cd4b23fec666446c22a989670d0413da1a2fc028ce1ae7e30bbe8a1547be49c4f04cf3961166821613b8482213134086c115a12e6791f8e2e WHIRLPOOL 74cf6bcd1a26363f9236030226846d583506722fa041d3bc3b45513bd465ff84295dc9c444cdd3a1e19424fc8abae86f68f78148b8fdca878dcfb3a48d10f90c
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..c3f00f85c9e7
--- /dev/null
+++ b/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..7d57640d86be
--- /dev/null
+++ b/app-text/dvipdfm/dvipdfm-0.13.2d-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/dvipdfm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/dvipdfmx/Manifest b/app-text/dvipdfmx/Manifest
new file mode 100644
index 000000000000..9c4bed12196b
--- /dev/null
+++ b/app-text/dvipdfmx/Manifest
@@ -0,0 +1 @@
+DIST dvipdfmx-20110311.tar.gz 616749 SHA256 ba7b052a17d8be4d94d64186fa77ddcce52ab5ee755b02e8444c56450ad2cbbe SHA512 0d5fc5dba35b0fe7074a392a99338861ce999809e5c20da830ebd6ba4c8ba45819054463862f3025d3a30c78aad227d3e014651ebf5e7976e86a3d9dac93d406 WHIRLPOOL 37bb24e9c8afbddf74e23896b3f106a12ed2441a43efb27944f6cc01467e8c5c53d7534df250ce65255b18ac62288efc0f7930e0debf8a1a4c35d49d0e9ed301
diff --git a/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild b/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
new file mode 100644
index 000000000000..15f315737ed6
--- /dev/null
+++ b/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..084e4884bf3a
--- /dev/null
+++ b/app-text/dvipdfmx/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<herd>tex</herd>
+	<herd>printing</herd>
+	<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..09eb08fc9bef
--- /dev/null
+++ b/app-text/dvipng/Manifest
@@ -0,0 +1,2 @@
+DIST dvipng-1.14.tar.gz 173686 SHA256 43f5b57d0fab29398dcec1b849e8bebbcacb0b9c06875d2ac84a049be3c5b350 SHA512 d7dda0e83ec93c0ebb9c970f2464ed1b04cdd41c178165db6da7c37b90810f3be0a513b9a43162563cb5ca15a7dec3c12a49f27abeb44fca3739090661ab53ba WHIRLPOOL 5510c41343ddc4f628eaac44b47e1e865b964d043ebf920706098f98e9f56d4557553487c15fd1931ea862350b1984f2276a37bd85ed60fb9a0b2caaa7293bc6
+DIST dvipng-1.15.tar.gz 171529 SHA256 197e9fd0f87ede32dc4bc1d39ec2cd72fa5260856f9d0dc2d8e6895130408347 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c WHIRLPOOL 4c0c5e410b107cd6cb56f9360acd556ae4336855d0624800d96e46cd29caead0467bc554d3d1c404e4564a3ce7b3732386f6af93ea98312c6b17745582f4ef92
diff --git a/app-text/dvipng/dvipng-1.14.ebuild b/app-text/dvipng/dvipng-1.14.ebuild
new file mode 100644
index 000000000000..9b84d76210e5
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+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 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="t1lib truetype test"
+
+RDEPEND="
+	dev-libs/kpathsea
+	media-libs/gd[jpeg,png]
+	media-libs/libpng
+	virtual/latex-base
+	sys-libs/zlib
+	t1lib? ( media-libs/t1lib )
+	truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wait.patch
+}
+
+src_configure() {
+	if ! use t1lib; then
+		# The build system autodetects libt1. We don't want that if the
+		# USE flag is not set, so confuse it with a wrong name.
+		sed -i -e 's/T1_InitLib/dIsAbLe&/' configure || die "sed failed"
+	fi
+
+	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/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
new file mode 100644
index 000000000000..c5f7cf43ab4b
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.15.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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[jpeg,png]
+	media-libs/libpng:0=
+	virtual/latex-base
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	virtual/pkgconfig
+	test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	if ! use truetype; then
+		sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed"
+	fi
+
+	export VARTEXFONTS="${T}/fonts"
+	econf
+}
diff --git a/app-text/dvipng/files/dvipng-1.14-wait.patch b/app-text/dvipng/files/dvipng-1.14-wait.patch
new file mode 100644
index 000000000000..d7f629fb372b
--- /dev/null
+++ b/app-text/dvipng/files/dvipng-1.14-wait.patch
@@ -0,0 +1,18 @@
+Patch by MATSUI Tetsushi to fix compilation issue on OSX
+
+sys/wait.h seems to be the man-page include for waitpid on Linux,
+Solaris and OSX
+
+https://bugs.gentoo.org/show_bug.cgi?id=369363
+
+--- special.c
++++ special.c
+@@ -26,7 +26,7 @@
+ 
+ #ifndef MIKTEX
+ #ifndef WIN32
+-#include <wait.h>
++#include <sys/wait.h>
+ #else /* WIN32 */
+ #include <fcntl.h>
+ #include <io.h>
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
new file mode 100644
index 000000000000..010b40ad8f6a
--- /dev/null
+++ b/app-text/dvipng/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<herd>emacs</herd>
+	<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;http://www.gnu.org/software/auctex/preview-latex.html&gt;.
+</longdescription>
+	<use>
+		<flag name="t1lib">Enable support for T1lib font rendering
+    (<pkg>media-libs/t1lib</pkg>)</flag>
+	</use>
+	<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..ce422ba4614c
--- /dev/null
+++ b/app-text/dvipsk/Manifest
@@ -0,0 +1,12 @@
+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-module-dvips-2012.tar.xz 95692 SHA256 9f12bb214eb245061bca42cd79fff999751725e35e972b2aa11439ced23f0d10 SHA512 cc5a5070fd04b501e2fae92864bfe027db2fb01cc5c0087fa62ba71ea044baa1166f5990d8545fc0b6ead130a069f825a6df243028ae1e8e7337d48936676d19 WHIRLPOOL 8c269d5242cb73cdeb83d6c304f9669fe3a7fbffa3faa67e765b5418c1ac8da8d1f3a2c20f9aea47b63734f813057aa99715c038de382f1ef3405e1cbf0a1b68
+DIST texlive-module-dvips-2013.tar.xz 114352 SHA256 cb3f058a3cfd139624d507f5b6cfdf8fd256978351d83148fa049e62f00f934e SHA512 816bb97b17548149435c5ce546cc84d11731be2c42a632e8146c8091367661be0b03dd939f244aca0d85d2d9706055dd82ca2bad66859043a8c7855b609b4991 WHIRLPOOL f5eabf48ba66113856db2baee6a5617bab35ffa09a4cca42b6c7fdb62b1adc14ae93fb53f8f45ce414bfa38d0630870f05b102e1450bc3b16e12a299a9b1de07
+DIST texlive-module-dvips-2014.tar.xz 149404 SHA256 a931b546fec3fa34fee40afcdd7fbf0ca5983a0865f1abe1a050ed0d462c5e95 SHA512 bed8d28ec69a1e42a5b18ca8c898e8ff519b9386a2926009c093dd34d61bd0edaa02e9de41fce4f166bb2687d64329451ea29a5e163614638ff48706d4276c94 WHIRLPOOL 29f5f39ebc1f7627505de5697d1d64c86fd9c55192007a2640dc26d26d9ba3315a1d8d7ec0826e5f5f46bebcc9c47f64c4adce1aa9e9792ce85deca89165ba5b
+DIST texlive-module-dvips-2015.tar.xz 159316 SHA256 dcf7b9cd4d1bd26d59e7e21ff944f843c59c4938c92175fa669287ca58097be0 SHA512 1dc167b54b4e8e5d45867247347e62a6d3613fcb20db6ae145e259e591ad96693f29f2b5ef0eecc2cb625f418c54c082646e3c36a61fdb25ea9d6715f87e6ef4 WHIRLPOOL f01876935b9281da5390bf24feb2dff4500db0e27eed0c7848ab905b998d50429ce5d1f9c6442d82944630d18b988b9ad1cd8c73a53f8daea3b876f6f73313b0
+DIST texlive-module-dvips.doc-2012.tar.xz 484056 SHA256 247a738b46cd7283179de5bbd8e4ecf330fb145a886580b5ebd5547cee530e9c SHA512 05e0719edd98169982daa4fbf8b943b71b8bf8b4ae4f84ae70015bbff4e7ba2d55c7a4ed4a8ccf081193669ecceeb21dd05476d104d3742be0842b1bba84a4a5 WHIRLPOOL 3af98dc454152c1c0a6abfda19c43a29a8701a4dab3d155b530c2a0e0c0f81db7911de31b491c08b0cca4b8a06172a58796f54a2ea2184ab6371fede7b627edd
+DIST texlive-module-dvips.doc-2013.tar.xz 484492 SHA256 76dfb96428aee66f6cac7ba1925f245f498e176028f4930c09b7fa7668c3374f SHA512 4886f1156b6984a146e0128b6ba627131dbd3281a9e084ac2852cf3929f1c4f6a302c54ad37734d0b97aae9e45a8193679405e6c33a54a1367fbb793f771c4e8 WHIRLPOOL 8941a5da4b375f9800153550aa32d8376e9519c1fea643a1f8ad24a0a20f81a1957bb0d5cbb8f56186fa12ef70c89ea3bac2af46d4e4d698a22ac78bf41d0943
+DIST texlive-module-dvips.doc-2014.tar.xz 482740 SHA256 a9cc6c6ec9f0ed97bc12bb8a3d8d6626419eb9956f4e1f1bd62893c2372d72e2 SHA512 d66ec3e70d57777363fc00f9789fda515cfea87968c9161870c695742935f696e830fc6b35da991cda6c78a1ef544cb36836c04411e6c7fa9b829b16365f5677 WHIRLPOOL fbfd2a7b61ffab4ef657d065b07fc2da6e99db069f4b672291830319795520bbf65ad8ae851c59c2361a850dd8dc5ecb3b1ebf08cf58596c3361715366642ac4
+DIST texlive-module-dvips.doc-2015.tar.xz 481208 SHA256 f3960b038f010ed8d2eafc60d3d22c89562acd9e995b41610a154fc3ade09940 SHA512 bbe2ff14b1f2f3cc3b5b2d7866cef64f33b7a8e1a5a71a9e6efd210748ab8fa5b6be94d0efe46d3b757b1c7db7713d9dfe56164c63488142eb790990a1d99f2c WHIRLPOOL 01d001648f33d45ca03b65d324c223d272771ee26c1bd852684b6581c742d8301fe3053b917a2a52fa7d7a7439c48cb1c9ec097fca2d1e9e319527862c899b64
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..4f9be483eda3
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.992_p20120701.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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.993_p20130530.ebuild b/app-text/dvipsk/dvipsk-5.993_p20130530.ebuild
new file mode 100644
index 000000000000..694322e8c99c
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.993_p20130530.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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=2013
+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 ~x86-freebsd ~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-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.994_p20140525.ebuild b/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild
new file mode 100644
index 000000000000..cd3de88e3681
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+
+inherit texlive-common eutils flag-o-matic toolchain-funcs
+
+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=2014
+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 ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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.0"
+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() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	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.995_p20150521.ebuild b/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
new file mode 100644
index 000000000000..c2febc07bb63
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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..709c45b017d6
--- /dev/null
+++ b/app-text/dvipsk/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
new file mode 100644
index 000000000000..8e1828ab6c03
--- /dev/null
+++ b/app-text/dvisvgm/Manifest
@@ -0,0 +1,8 @@
+DIST dvisvgm-1.10.tar.gz 831654 SHA256 339f4dcef0916c1daaf1b65d966737279464ec6858b28fda7196d8030d7f3735 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906 WHIRLPOOL 398e5378ce6e84768b73f7d6e9776eb177619de785a70d8fa416fecb275903e49c065ec23d78881eede9d4944525ecfba44d34a5d1b74b87dc1ef6ecf127b869
+DIST dvisvgm-1.2.1.tar.gz 611862 SHA256 497233213e86286df9c3db9b23d084d74704d5bf956c17770b4e0d945c2f642c SHA512 8a15515134c5c8a7c6731500535f7a10e0e8d27b44f79111e967cdb66505c4256644809372e28425f77bdf63bba8697e91dd6f13452bd1aa7e2d9d8869643766 WHIRLPOOL 03b3cbbb1e3bbb665f41e5c82c9870db730bcaa318550b0e5b069ff1fc3b0420d1975ea6ee4e02db030fa500b720bb80386886f06bf99b2cf8cddb7a8f4497c6
+DIST dvisvgm-1.3.tar.gz 589834 SHA256 16111448e49b49f1cac70f9d354d07b6136c5bd94f7c68a171e595bc6a857a01 SHA512 35166123fa8a39a4b32e3dbc57383fd1e011268931ce1d00dd04d77c947f5565b98d380dd888b34296dbfbf14b9cf00d2ee2bb27045103f37e7165c08aaf94d6 WHIRLPOOL b06e7fd1adf34a29817f6db5b3fbbf11f094b59b077e6d13351be732ac607d6314e94806f6412a94e827c5d127391884ef3e6cbb8ba18901b024b69209de7f2b
+DIST dvisvgm-1.4.tar.gz 615003 SHA256 d68b4c172e53f38e5067b5f09fb0577a13ae55658246008101e862f4ab2cf622 SHA512 14491b95262dd24f191cb757fc78ca6c06e6ad2b8b7eeea4c8451c4234be07a2353c726d38543cd27dcb6e30137d3ceea05ac64b7f65487a8271c7c4ccdcb15d WHIRLPOOL 628d47a69543307464216cc18d3519be6daa138955a4d6024af3907cc1448fbbab1f9ba3f586cc8cfffe735cabd3e30cafc867b95935a9d320661bf27d99683f
+DIST dvisvgm-1.5.2.tar.gz 646578 SHA256 cd79aa6b1b37aac6cbb56c94e4e8bc65efbf61000d590877275719c6638803ea SHA512 aba54e297c6b890bff42efe94f4d1e8e7936750cb8924d554bc82cb413578e7fafccb54a9bb9fe663a6a82837d4a116b5217d14c088cfc8b8a8580cd66875413 WHIRLPOOL 9bb4b04a2b7e5cbed11fbcbdaacaa3b9ab8806d41e9963323e5ff71483ada4c03f005abf43f30af6b5f9cd1ba7d55af6703ba0878a27c8f014d607d959667b4e
+DIST dvisvgm-1.8.1.tar.gz 706270 SHA256 6832e3f4b43fa0b96333c1857012e70a83f059b0d222239936e1d6fa3b62cc08 SHA512 6ca3f0e4ff28fa59d14dd5891b205db850bb8c91531e6bcda05a3e6bb7e2bca9d71eaca4bf408577cd756277e8f3b6be12e5b3102fb848b329f66b7a9eda0270 WHIRLPOOL 0bd6e23c2df1499f4d106d007ff995bbbeb70482bc0087ff3acfcb921085f24ac66374ee949f00ccc6ee56c104880a4a58ad365df0a5ce91c65409a3a3c097bc
+DIST dvisvgm-1.9.2.tar.gz 756357 SHA256 813f8ce35f7cd9c98647d50628c74d9389b2366e56fba696c083fc230e72418f SHA512 1ab510e7e003707a765429776891cd2fcda3fd17623123f858ed11af0d4cf36540f431626b4af653cb3395c94ec8edcd07120f599ed7b313c8dc34e7a4e24198 WHIRLPOOL 12520ca2c3727852106259d1b11f388844fe7aba1244c177ba778592b9ffd48eb07f63f8a57183b98b331648d3884f19e9697a2367f0b223bd5077196329a7b2
+DIST dvisvgm-1.9.tar.gz 733672 SHA256 254856acaa9f046053632d5cb2ae6c334c6767d4be727fd03dd1c5c48781c95a SHA512 01d94273513c5269454ff376deb9712df79f720fc2e3b84623e80a5375f16eec01b8f9df00946f659c0fc4ced28de62469d7d0236b3554be0ef8cb2182798fee WHIRLPOOL 1b067d111fb89f23808c6deb32f26b0c2a4005574e78b3cf359032298c46494fb6bc0994059bc23ad61c5f920abca5f8e72d7cd2afc5c8eb6e66311b3f9a9361
diff --git a/app-text/dvisvgm/dvisvgm-1.10.ebuild b/app-text/dvisvgm/dvisvgm-1.10.ebuild
new file mode 100644
index 000000000000..804e28c65174
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-1.2.1.ebuild b/app-text/dvisvgm/dvisvgm-1.2.1.ebuild
new file mode 100644
index 000000000000..41099fb295a6
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.3.ebuild b/app-text/dvisvgm/dvisvgm-1.3.ebuild
new file mode 100644
index 000000000000..1b7b0d7e87e4
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.4.ebuild b/app-text/dvisvgm/dvisvgm-1.4.ebuild
new file mode 100644
index 000000000000..26377ee07292
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.5.2.ebuild b/app-text/dvisvgm/dvisvgm-1.5.2.ebuild
new file mode 100644
index 000000000000..40a285cdadc0
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.5.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.8.1.ebuild b/app-text/dvisvgm/dvisvgm-1.8.1.ebuild
new file mode 100644
index 000000000000..e4ad428847e1
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.9.2.ebuild b/app-text/dvisvgm/dvisvgm-1.9.2.ebuild
new file mode 100644
index 000000000000..33b38d9003de
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.9.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.9.ebuild b/app-text/dvisvgm/dvisvgm-1.9.ebuild
new file mode 100644
index 000000000000..7020cad57f2f
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/files/dvisvgm-1.0.8-as-needed.patch b/app-text/dvisvgm/files/dvisvgm-1.0.8-as-needed.patch
new file mode 100644
index 000000000000..85e95b1b6a92
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-1.0.8-as-needed.patch
@@ -0,0 +1,11 @@
+--- dvisvgm-1.0.8/configure.ac
++++ dvisvgm-1.0.8/configure.ac
+@@ -106,7 +106,7 @@
+ # Check for libraries.
+ PKG_CHECK_MODULES([FREETYPE], [freetype2])
+ CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
+-LDFLAGS="$LDFLAGS ${FREETYPE_LIBS}"
++LIBS="$LIBS ${FREETYPE_LIBS}"
+ 
+ AC_CHECK_LIB(z, gzopen)
+ 
diff --git a/app-text/dvisvgm/files/dvisvgm-1.0.8-darwin.patch b/app-text/dvisvgm/files/dvisvgm-1.0.8-darwin.patch
new file mode 100644
index 000000000000..aef51d517474
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-1.0.8-darwin.patch
@@ -0,0 +1,10 @@
+--- src/Process.cpp
++++ src/Process.cpp
+@@ -25,6 +25,7 @@
+ #include <fcntl.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <signal.h>
+ #endif
+ 
+ #include <cstdlib>
diff --git a/app-text/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
new file mode 100644
index 000000000000..cdb4a49863d0
--- /dev/null
+++ b/app-text/dvisvgm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">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..daaa9f4ddab4
--- /dev/null
+++ b/app-text/ebook-tools/Manifest
@@ -0,0 +1 @@
+DIST ebook-tools-0.2.2.tar.gz 46889 SHA256 cbc35996e911144fa62925366ad6a6212d6af2588f1e39075954973bbee627ae SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a WHIRLPOOL c9c3a5bd48d1821f2e823538f33ba8cd90ff56ad4d1b6c73a7592b086ef86c617ac64a707b270b5483734a16217640afba4591095bf445ec0e4ef77b8f3e5c8d
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2.ebuild
new file mode 100644
index 000000000000..42797564390d
--- /dev/null
+++ b/app-text/ebook-tools/ebook-tools-0.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Tools for accessing and converting various ebook file formats"
+HOMEPAGE="http://sourceforge.net/projects/ebook-tools"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libxml2
+	dev-libs/libzip"
+RDEPEND="${DEPEND}
+	app-text/convertlit"
+
+DOCS=( INSTALL README TODO )
diff --git a/app-text/ebook-tools/metadata.xml b/app-text/ebook-tools/metadata.xml
new file mode 100644
index 000000000000..5f9aaf4ba85b
--- /dev/null
+++ b/app-text/ebook-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>
+	<herd>kde</herd>
+	<upstream>
+		<remote-id type="sourceforge">ebook-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
new file mode 100644
index 000000000000..5a6d052e37c4
--- /dev/null
+++ b/app-text/enchant/Manifest
@@ -0,0 +1 @@
+DIST enchant-1.6.0.tar.gz 607018 SHA256 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137 WHIRLPOOL f6677a11f1d05e210cbd6a7b13f3987ea93b3f1e73537b048093c14686b0310e75a89fdb8798ad0ed386a7e1cd793f60820006df8c1f7919c46c7245ee6a74c9
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..1e8800f61b82
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="aspell +hunspell static-libs zemberek"
+
+COMMON_DEPENDS="dev-libs/glib:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1 )
+	zemberek? ( dev-libs/dbus-glib )"
+
+RDEPEND="${COMMON_DEPENDS}
+	zemberek? ( app-text/zemberek-server )"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( hunspell aspell zemberek )"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+src_prepare() {
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		tests/Makefile.am || 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 --all
+}
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
new file mode 100644
index 000000000000..d74743a19905
--- /dev/null
+++ b/app-text/enchant/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome-office</herd>
+	<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..8d4585af1ed3
--- /dev/null
+++ b/app-text/enscript/Manifest
@@ -0,0 +1 @@
+DIST enscript-1.6.6.tar.gz 1330493 SHA256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc WHIRLPOOL 718d06a76add39cc916a4a30262049787de73aee5e569407bf5a40eba4f90cd47c89ed6cc151269175d4fe250c15f6a04aed138828315988697d5b9eda03d055
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..bc88508ad6f4
--- /dev/null
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="powerful text-to-postscript converter"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="http://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
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
+
+	insinto /usr/share/enscript/hl
+	doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
+
+	if use ruby ; then
+		insinto /usr/share/enscript/hl
+		doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "Now, customize /etc/enscript.cfg."
+}
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..1fa0ca569505
--- /dev/null
+++ b/app-text/enscript/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
new file mode 100644
index 000000000000..eaa906f56e92
--- /dev/null
+++ b/app-text/epspdf/Manifest
@@ -0,0 +1,3 @@
+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
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..0e83588f4233
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.5.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..513b7b3b18c4
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..8d80bcdbdcc3
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/epspdf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
new file mode 100644
index 000000000000..503bc8e932e5
--- /dev/null
+++ b/app-text/epstool/Manifest
@@ -0,0 +1 @@
+DIST epstool-3.08.tar.gz 191567 SHA256 f3f14b95146868ff3f93c8720d5539deef3b6531630a552165664c7ee3c2cfdd SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1 WHIRLPOOL 18b23dec04a5d08a849051fc8e0912f1bad5a73a2bcaff181a0a48bcce7fa0008ac1184bb4df6a74a0d7c64ce58b27d911195dd71d257201e0efad8afbe02d33
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..622cf5950d1f
--- /dev/null
+++ b/app-text/epstool/epstool-3.08-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes,converts to bitmaps"
+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..ff62877c67ae
--- /dev/null
+++ b/app-text/epstool/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>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/epubcheck/Manifest b/app-text/epubcheck/Manifest
new file mode 100644
index 000000000000..39f814b071cb
--- /dev/null
+++ b/app-text/epubcheck/Manifest
@@ -0,0 +1 @@
+DIST epubcheck-src-1.1.zip 2442421 SHA256 f9db760358b34d9d98d243156e38f905e0f8735d26b8bf3550e3b108f2436be9 SHA512 4ba5fbb149a071c1dfed97ab00500afabb0690eb081967203e8ae6691b3ab9d676bf0a4cb29c5cf203db253a8e7a4c1bfccbd07b2ee377ec02656ba378a6d252 WHIRLPOOL 4e98ab1b4c2ef3412bc0109876d84ad4b9a212b7718d8ea60214ca8521571b6c068ca6bbb62e371e2558e199ebe8003b517413881e0a59574ab14e2e5452baee
diff --git a/app-text/epubcheck/epubcheck-1.1.ebuild b/app-text/epubcheck/epubcheck-1.1.ebuild
new file mode 100644
index 000000000000..e88bab0331e3
--- /dev/null
+++ b/app-text/epubcheck/epubcheck-1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Tool to validate IDPF EPUB files"
+HOMEPAGE="https://code.google.com/p/epubcheck/"
+SRC_URI="https://${PN}.googlecode.com/files/${PN}-src-${PV}.zip"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="dev-java/jigsaw:0
+	dev-java/saxon:6.5"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	rm -f lib/*.jar
+
+	java-pkg_jar-from --into lib/ jigsaw
+	java-pkg_jar-from --into lib/ saxon-6.5
+
+	cd lib/
+	ln -s $(java-config --tools)
+}
+
+src_compile() {
+	eant buildJar
+}
+
+src_test() {
+	java -cp "$(java-pkg_getjars jigsaw,saxon-6.5):dist/${P}.jar" \
+		com.adobe.epubcheck.autotest.AutoTest testdocs/general/tests.xml testdocs/general/ \
+		|| die "tests failed"
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	java-pkg_dolauncher ${PN} --main com.adobe.epubcheck.tool.Checker
+
+	dodoc README.txt
+}
diff --git a/app-text/epubcheck/metadata.xml b/app-text/epubcheck/metadata.xml
new file mode 100644
index 000000000000..63ac5653603a
--- /dev/null
+++ b/app-text/epubcheck/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>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
new file mode 100644
index 000000000000..e3b88e2321e7
--- /dev/null
+++ b/app-text/evince/Manifest
@@ -0,0 +1,2 @@
+DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a332e9b384957c453fd67bf0070 SHA512 f6a2b4037a055997316f2820b2ec6d171f51b0005b16070a2f990d5738ad39a14cc6e4662ad785da528d5e8d8ac48bba3a628c0b728578b00f09859d08b79aa6 WHIRLPOOL 02dc43bf594480a02a3e76e95e0391cc13ca57c0974e304181d3e9a25361298fbdfc9ae43ff03f9e564d8d5704f301021b700da61a684987908fd0fe6459fce9
+DIST evince-3.16.1.tar.xz 3113776 SHA256 06ff75065b2a30cd588c402f6bd2ea88ee3166181805e0cc00bd54f71dbf6130 SHA512 bca890e2203e8c5d092a9a728f9e0545437e701eb2af790edc074b080d8529e639132e77caff2f77e8f1b8eb359b2c094af9252c08fb8518c98a6fb554c7dc6c WHIRLPOOL 69ce52248097cfc23848a14c71a845256c6b668d2a72f43af3eefbdeb0ceb2877811ef389bf337f410b6b54b9d456baa172b5067b9389eda7588c61ce44be8df
diff --git a/app-text/evince/evince-3.14.2-r1.ebuild b/app-text/evince/evince-3.14.2-r1.ebuild
new file mode 100644
index 000000000000..aa419efd5c4f
--- /dev/null
+++ b/app-text/evince/evince-3.14.2-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+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 gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+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.14:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.24:=[cairo]
+	djvu? ( >=app-text/djvu-3.5.17:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gnome? ( gnome-base/gnome-desktop:3 )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
+	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/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	x11-themes/gnome-icon-theme-symbolic
+"
+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
+	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_with libsecret keyring) \
+		$(use_enable gnome libgnome-desktop) \
+		$(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 \
+		ITSTOOL=$(type -P true)
+}
diff --git a/app-text/evince/evince-3.16.1.ebuild b/app-text/evince/evince-3.16.1.ebuild
new file mode 100644
index 000000000000..f080717d6fd4
--- /dev/null
+++ b/app-text/evince/evince-3.16.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+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 gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+# atk used in libview
+# gdk-pixbuf used all over the place
+# libX11 used for totem-screensaver
+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.15.3:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.24:=[cairo]
+	djvu? ( >=app-text/djvu-3.5.17:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gnome? ( gnome-base/gnome-desktop:3 )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
+	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/gnome-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+	x11-themes/gnome-icon-theme-symbolic
+"
+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
+	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_with libsecret keyring) \
+		$(use_enable gnome libgnome-desktop) \
+		$(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 \
+		ITSTOOL=$(type -P true)
+}
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
new file mode 100644
index 000000000000..fb5b2ec52786
--- /dev/null
+++ b/app-text/evince/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<flag name="dvi">Enable the built-in DVI viewer</flag>
+		<flag name="libsecret">Enable support for credentials store</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..7ec8c52b971e
--- /dev/null
+++ b/app-text/expander/Manifest
@@ -0,0 +1 @@
+DIST nedit_expander_kit_2.05.tar.gz 92571 SHA256 6d2ebebfc50b277b375eba6325d8d9ef381a9a12d8e581c0b65ce28e1f0eff15 SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee WHIRLPOOL 8eb5664b1892234db2463c63e32f9743375da979ccdd7af1f5fbdd8b25713ab2c65c2e07e1e0d43e8c06cfea98847c78f5ed7da86e1727a6669615b7c82b606a
diff --git a/app-text/expander/expander-2.0.5-r1.ebuild b/app-text/expander/expander-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..d5995a569e2e
--- /dev/null
+++ b/app-text/expander/expander-2.0.5-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 /usr/bin/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..59e2b8f78cb5
--- /dev/null
+++ b/app-text/expander/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>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/fbless/Manifest b/app-text/fbless/Manifest
new file mode 100644
index 000000000000..9d3357755ea2
--- /dev/null
+++ b/app-text/fbless/Manifest
@@ -0,0 +1 @@
+DIST fbless-0.2.2.tar.gz 101438 SHA256 0b5e98293e311df52220b5bb2ab74f3fda9e6776e84d963cb18bc6e622e1793b SHA512 93c20d7d2a53790319443c4cb5383ca4b7dbe1c31755ab0bcce748f02a7786ce728629164120aecd1b8cfb36cb082a28d119c882656d54649bbfdfaa0a4e4959 WHIRLPOOL 6c6c7ee572a9bac0d0301e41c336e13f1ef1403591995235aa955254b1f6d08ef2ca5952367e1fb80cf50f3b8caff15b8a49b73e3cec3f6a6885b324498b0790
diff --git a/app-text/fbless/fbless-0.2.2-r1.ebuild b/app-text/fbless/fbless-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..cbebd85199e9
--- /dev/null
+++ b/app-text/fbless/fbless-0.2.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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="mirror://github/matimatik/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-text/fbless/fbless-9999.ebuild b/app-text/fbless/fbless-9999.ebuild
new file mode 100644
index 000000000000..e5e6014204e2
--- /dev/null
+++ b/app-text/fbless/fbless-9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/matimatik/fbless.git"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,xml"
+inherit distutils-r1 git-2
+
+DESCRIPTION="Python-based console fb2 reader with less-like interface"
+HOMEPAGE="https://github.com/matimatik/fbless"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
diff --git a/app-text/fbless/metadata.xml b/app-text/fbless/metadata.xml
new file mode 100644
index 000000000000..b94405ebb942
--- /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>
+    <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/fbreader/Manifest b/app-text/fbreader/Manifest
new file mode 100644
index 000000000000..21a3b474c290
--- /dev/null
+++ b/app-text/fbreader/Manifest
@@ -0,0 +1 @@
+DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9
diff --git a/app-text/fbreader/fbreader-0.99.4-r1.ebuild b/app-text/fbreader/fbreader-0.99.4-r1.ebuild
new file mode 100644
index 000000000000..5b86080e93a3
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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
+}
+
+src_install() {
+	default
+	dosym /usr/bin/FBReader /usr/bin/fbreader
+}
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..8741fcdae6e6
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym /usr/bin/FBReader /usr/bin/fbreader
+}
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..2525aa08b3de
--- /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>
+    	<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..c0967c4c9607
--- /dev/null
+++ b/app-text/fdftk/Manifest
@@ -0,0 +1 @@
+DIST FDFToolkitForUnix.tar.gz 5725906 SHA256 f7da280f258051f790efdcb6717c95f11acd410f825a0450864d4eea943afa51
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..ef39bae10a48
--- /dev/null
+++ b/app-text/fdftk/fdftk-6.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..fc9b2c132a67
--- /dev/null
+++ b/app-text/fdftk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
new file mode 100644
index 000000000000..ac0d6ba6989e
--- /dev/null
+++ b/app-text/flpsed/Manifest
@@ -0,0 +1,3 @@
+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
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..486cea1eb43d
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.7.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://www.ecademix.com/JohannesHofmann/"
+SRC_URI="http://www.ecademix.com/JohannesHofmann/${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..5bfb081d6ed9
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.7.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://www.ecademix.com/JohannesHofmann/"
+SRC_URI="http://www.ecademix.com/JohannesHofmann/${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..3580e00da09a
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://www.ecademix.com/JohannesHofmann/"
+SRC_URI="http://www.ecademix.com/JohannesHofmann/${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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/flpsed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/freepwing/Manifest b/app-text/freepwing/Manifest
new file mode 100644
index 000000000000..c6886f8f2beb
--- /dev/null
+++ b/app-text/freepwing/Manifest
@@ -0,0 +1 @@
+DIST freepwing-1.4.3.tar.gz 129499 SHA256 34287268520b622ada5b1390dbec346e586e04509278eb2e3baad67f494f3796 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734 WHIRLPOOL 2133bba842d1c37139182ffd9aaf3b4d1a443edd296043dd5b9ffecd6e96e4d828748b4623f26d52404654bf37b277b655cd7dc70e552a32a30cee5c35808bd2
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..77ead4a318f0
--- /dev/null
+++ b/app-text/freepwing/freepwing-1.4.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..91f4e72fb544
--- /dev/null
+++ b/app-text/freepwing/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
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..55861f892a0f
--- /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 Technologies Inc.
+     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..dd2e6fe22f52
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit sgml-catalog
+
+S=${WORKDIR}
+DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
+HOMEPAGE="http://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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
new file mode 100644
index 000000000000..c19fd2f2a1a2
--- /dev/null
+++ b/app-text/getxbook/Manifest
@@ -0,0 +1 @@
+DIST getxbook-1.0.tar.bz2 22314 SHA256 ce0f7d0bcd9002d31c94617cecde8145cbc138a2ab3aed1a75af26b26e3e9521 SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941 WHIRLPOOL 863b3c21b7c79166d3ac14cc7e11971b6aee4ba724eef48362bdf56b58fba21fd61a9162a2839b4f981cf6e2dd61228b69ea00adad8b84a62cf14530dd45d580
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..b8af2fec4a3e
--- /dev/null
+++ b/app-text/getxbook/getxbook-1.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5569be9d2239
--- /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>
+    <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..0cb215a32e3b
--- /dev/null
+++ b/app-text/ghostscript-gpl/Manifest
@@ -0,0 +1,5 @@
+DIST ghostscript-9.10.tar.bz2 30983380 SHA256 6c8d9d1b23bd8ffd238274e342a40ab21762b0aab6355083ca0db673267dd580 SHA512 59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04 WHIRLPOOL e4471563d57882bc111f6a0d48a003ee56692f7ae94c53776be4a5f14fe0d43e2671bc04f8af04d65f3e73bd2e7d68961f9d77cbf644cdd327186ee3ed9ed4c2
+DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c SHA512 5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e WHIRLPOOL 9e434278560af8fcc92119309eaaf80d615571d971b06d6e26f40317224bd7af49f2115eda4c914ed9c0bd4755439c91929fa3884eca5beb968c73377eab5f28
+DIST ghostscript-gpl-9.10-patchset-1.tar.bz2 5099 SHA256 f5b515295db2ad70a196ff2aee382d1a01c471ba64671f5b05f504f1109c97c1 SHA512 ae984dae5c426c488480c7c3f0e2eaf473c521c47b968ee91880264f5dbf1df8d992398bbf4dfdc82763953a9ad681c098da3561b203e596ed1ac0edc35d84da WHIRLPOOL c3b353f6f102dd79e229a92770720e50729228baaea950a2b5364541631958616b2d3d55c584875efd75f6c31a5b787bdba87ce452779ec9040966e6019a463d
+DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6
+DIST gsdjvu-1.6.tar.gz 207122 SHA256 6236b14b79345eda87cce9ba22387e166e7614cca2ca86b1c6f0d611c26005df SHA512 57f3866f1f863fa31f066b45ee679cfbdf2c6a9bec922f24fa9f50dd3ea52f192b4c9889b0c9657e96ca9e3528d3fea7dcc53b4d1ea87dd49d138ce9c9684884 WHIRLPOOL 66e5222412d9da2d616ba0a3f73548d031b3e6726eff7bc60bea703b02ce4d22e100adad1faf3fabaac379b4ef8324324eabb8b5320f74ebafe929b577dd6c8d
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
new file mode 100644
index 000000000000..8625c1a3c156
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib versionator flag-o-matic
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="http://ghostscript.com/"
+
+MY_P=${P/-gpl}
+GSDJVU_PV=1.6
+PVM=$(get_version_component_range 1-2)
+SRC_URI="
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
+	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
+
+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 djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.5:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	djvu? ( app-text/djvu )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	idn? ( net-dns/libidn )
+	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
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_ko? ( media-fonts/baekmuk-fonts )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_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} linguas_${X}"
+done
+
+pkg_setup() {
+	if use djvu; then
+		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+}
+
+src_prepare() {
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs
+	rm -rf "${S}"/expat
+	rm -rf "${S}"/freetype
+	rm -rf "${S}"/jbig2dec
+	rm -rf "${S}"/jpeg{,xr}
+	rm -rf "${S}"/lcms{,2}
+	rm -rf "${S}"/libpng
+	rm -rf "${S}"/tiff
+	rm -rf "${S}"/zlib
+	# remove internal urw-fonts
+	rm -rf "${S}"/Resource/Font
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
+	EPATCH_SOURCE="${WORKDIR}/patches/"
+	epatch
+
+	if use djvu ; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
+		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
+		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
+		grep -q djvusep "${S}"/contrib/contrib.mak || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
+
+		# install ps2utf8.ps, bug #197818
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
+			"${S}"/base/unixinst.mak || die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# search path fix
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/ijs"
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		/usr/share/fonts/urw-fonts \
+		/usr/share/fonts/Type1 \
+		/usr/share/fonts \
+		/usr/share/poppler/cMap/Adobe-CNS1 \
+		/usr/share/poppler/cMap/Adobe-GB1 \
+		/usr/share/poppler/cMap/Adobe-Japan1 \
+		/usr/share/poppler/cMap/Adobe-Japan2 \
+		/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+	done
+
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-lcms \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with idn libidn) \
+		$(use_with X x)
+
+	if use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
+			"${S}"/Makefile || die "sed failed"
+	fi
+
+	cd "${S}/ijs"
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# workaround: -j1 -> see bug #234378
+	emake -j1 so all
+
+	cd "${S}/ijs"
+	emake
+}
+
+src_install() {
+	# workaround: -j1 -> see bug #356303
+	emake -j1 DESTDIR="${D}" install-so install
+
+	if use djvu ; then
+		dobin gsdjvu
+	fi
+
+	# remove gsc in favor of gambit, bug #253064
+	rm -rf "${D}/usr/bin/gsc"
+
+	cd "${S}/ijs"
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${D}/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"
+	doins "${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug 409361
+	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+
+	use static-libs || find "${D}" -name '*.la' -delete
+
+	use linguas_de || rm -r "${D}"/usr/share/man/de
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
new file mode 100644
index 000000000000..b5afb039fb7e
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib versionator flag-o-matic
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="http://ghostscript.com/"
+
+MY_P=${P/-gpl}
+GSDJVU_PV=1.6
+PVM=$(get_version_component_range 1-2)
+SRC_URI="
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
+	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
+
+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 djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.5:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	djvu? ( app-text/djvu )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	idn? ( net-dns/libidn )
+	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
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_ko? ( media-fonts/baekmuk-fonts )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_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} linguas_${X}"
+done
+
+pkg_setup() {
+	if use djvu; then
+		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+}
+
+src_prepare() {
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs
+	rm -rf "${S}"/expat
+	rm -rf "${S}"/freetype
+	rm -rf "${S}"/jbig2dec
+	rm -rf "${S}"/jpeg{,xr}
+	rm -rf "${S}"/lcms{,2}
+	rm -rf "${S}"/libpng
+	rm -rf "${S}"/tiff
+	rm -rf "${S}"/zlib
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
+	EPATCH_SOURCE="${WORKDIR}/patches/"
+	epatch
+
+	if use djvu ; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
+		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
+		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
+		grep -q djvusep "${S}"/contrib/contrib.mak || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
+
+		# install ps2utf8.ps, bug #197818
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
+			"${S}"/base/unixinst.mak || die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/ijs"
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		/usr/share/fonts/urw-fonts \
+		/usr/share/fonts/Type1 \
+		/usr/share/fonts \
+		/usr/share/poppler/cMap/Adobe-CNS1 \
+		/usr/share/poppler/cMap/Adobe-GB1 \
+		/usr/share/poppler/cMap/Adobe-Japan1 \
+		/usr/share/poppler/cMap/Adobe-Japan2 \
+		/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+	done
+
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-lcms \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with idn libidn) \
+		$(use_with X x)
+
+	if use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
+			"${S}"/Makefile || die "sed failed"
+	fi
+
+	cd "${S}/ijs"
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# workaround: -j1 -> see bug #234378
+	emake -j1 so all
+
+	cd "${S}/ijs"
+	emake
+}
+
+src_install() {
+	# workaround: -j1 -> see bug #356303
+	emake -j1 DESTDIR="${D}" install-so install
+
+	if use djvu ; then
+		dobin gsdjvu
+	fi
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
+
+	cd "${S}/ijs"
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${D}/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"
+	doins "${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+
+	use static-libs || find "${D}" -name '*.la' -delete
+
+	use linguas_de || rm -r "${D}"/usr/share/man/de
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
new file mode 100644
index 000000000000..84e590c8ae36
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib versionator flag-o-matic
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="http://ghostscript.com/"
+
+MY_P=${P/-gpl}
+GSDJVU_PV=1.6
+PVM=$(get_version_component_range 1-2)
+SRC_URI="
+	http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
+	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
+
+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 djvu gtk idn linguas_de static-libs X"
+RESTRICT="djvu? ( bindist )"
+
+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/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	djvu? ( app-text/djvu )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	idn? ( net-dns/libidn )
+	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
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_ko? ( media-fonts/baekmuk-fonts )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_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} linguas_${X}"
+done
+
+pkg_setup() {
+	if use djvu; then
+		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+}
+
+src_prepare() {
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs
+	rm -rf "${S}"/expat
+	rm -rf "${S}"/freetype
+	rm -rf "${S}"/jbig2dec
+	rm -rf "${S}"/jpeg{,xr}
+	rm -rf "${S}"/lcms{,2}
+	rm -rf "${S}"/libpng
+	rm -rf "${S}"/tiff
+	rm -rf "${S}"/zlib
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
+	EPATCH_SOURCE="${WORKDIR}/patches/"
+	epatch
+
+	if use djvu ; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
+		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
+		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
+		grep -q djvusep "${S}"/contrib/contrib.mak || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
+
+		# install ps2utf8.ps, bug #197818
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
+			"${S}"/base/unixinst.mak || die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/ijs"
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		/usr/share/fonts/urw-fonts \
+		/usr/share/fonts/Type1 \
+		/usr/share/fonts \
+		/usr/share/poppler/cMap/Adobe-CNS1 \
+		/usr/share/poppler/cMap/Adobe-GB1 \
+		/usr/share/poppler/cMap/Adobe-Japan1 \
+		/usr/share/poppler/cMap/Adobe-Japan2 \
+		/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+	done
+
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-lcms \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with idn libidn) \
+		$(use_with X x)
+
+	if use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
+			"${S}"/Makefile || die "sed failed"
+	fi
+
+	cd "${S}/ijs"
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# -j1 needed because of bug #550926
+	emake -j1 so all
+
+	cd "${S}/ijs"
+	emake
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install-so install
+
+	if use djvu ; then
+		dobin gsdjvu
+	fi
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
+
+	cd "${S}/ijs"
+	emake -j1 DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${D}/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"
+	doins "${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+
+	use static-libs || find "${D}" -name '*.la' -delete
+
+	use linguas_de || rm -r "${D}"/usr/share/man/de
+}
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
new file mode 100644
index 000000000000..cfe6470e77d0
--- /dev/null
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">djvu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/glark/Manifest b/app-text/glark/Manifest
new file mode 100644
index 000000000000..bf5e958835b0
--- /dev/null
+++ b/app-text/glark/Manifest
@@ -0,0 +1 @@
+DIST glark-git-1.10.5.tgz 196283 SHA256 b6d12ca82d1f88b14476f40e98ae9c34801107a49fb21871c8189a01bc824647 SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c WHIRLPOOL d8853c288b96600acd0802688ffe864fbe4841ce1bbc7845dce67f23bf16a2f728d0ccf7758f70a321a58e0a093ced6cf54606542c766d4b8ed090d87fd8f223
diff --git a/app-text/glark/files/1.7.4/glark-completion b/app-text/glark/files/1.7.4/glark-completion
new file mode 100644
index 000000000000..2a1c596f63dd
--- /dev/null
+++ b/app-text/glark/files/1.7.4/glark-completion
@@ -0,0 +1,33 @@
+# Author: Ciaran McCreesh <ciaranm@gentoo.org>
+#
+# completion for glark
+
+_glark()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]] ; then
+		COMPREPLY=( $( compgen -W ' --directories --binary-files --basename \
+			--name --fullname --path --exclude-matching --recurse \
+			--split-as-path --no-split-as-path --and --before --after \
+			--file --ignore-case --match-limit --or --range \
+			--invert-match --word --word-regexp --line-regexp --xor \
+			--after-context --before-context --context --count \
+			--file-color --no-filter --grep --no-filename --with-filename \
+			--files-with-matches --files-without-match --line-number \
+			--no-line-number --line-number-color --text-color --highlight \
+			--no-highlight --extract-matches --null --help --config \
+			--explain --quiet --no-messages --no-quiet --version \
+			--verbose --label' -- $cur ) )
+	else
+	    _filedir
+	fi
+}
+
+complete -o filenames -F _glark glark
+
+# vim: set ft=sh sw=4 et sts=4 :
diff --git a/app-text/glark/files/1.8.0/glark-completion b/app-text/glark/files/1.8.0/glark-completion
new file mode 100644
index 000000000000..be1706f63686
--- /dev/null
+++ b/app-text/glark/files/1.8.0/glark-completion
@@ -0,0 +1,33 @@
+# Author: Ciaran McCreesh <ciaranm@gentoo.org>
+#
+# completion for glark
+
+_glark()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]] ; then
+		COMPREPLY=( $( compgen -W ' --directories --binary-files --basename \
+			--name --fullname --path --exclude-matching --recurse --size-limit \
+			--split-as-path --no-split-as-path --and --before --after \
+			--file --ignore-case --match-limit --or --range \
+			--invert-match --word --word-regexp --line-regexp --xor \
+			--after-context --before-context --context --count \
+			--file-color --no-filter --grep --no-filename --with-filename \
+			--files-with-matches --files-without-match --line-number \
+			--no-line-number --line-number-color --text-color --highlight \
+			--no-highlight --extract-matches --null --help --conf --dump \
+			--explain --quiet --no-messages --no-quiet --version \
+			--verbose --label' -- $cur ) )
+	else
+	    _filedir
+	fi
+}
+
+complete -o filenames -F _glark glark
+
+# vim: set ft=sh sw=4 et sts=4 :
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..a42836227802
--- /dev/null
+++ b/app-text/glark/glark-1.10.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+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/glark-1.10.5.ebuild b/app-text/glark/glark-1.10.5.ebuild
new file mode 100644
index 000000000000..4c18482504f2
--- /dev/null
+++ b/app-text/glark/glark-1.10.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+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..833edc26e0fb
--- /dev/null
+++ b/app-text/glark/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <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..ac78040b29f6
--- /dev/null
+++ b/app-text/glosung/Manifest
@@ -0,0 +1 @@
+DIST glosung-3.6.2.tar.bz2 65089 SHA256 5b46cd776b51ea3ace6ef901512c4100e79ce5225f7d7cf910b69d930b7df4c9 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11 WHIRLPOOL 91bb6e08f149430edb41b901072b5fe4993590f7ef173b99f313d857539e1be40dd00797b8623312da8a2909be7577d39b5804523e3b79bce00eccf919ee5a8c
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.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..2d12bf81785b
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/app-text/glosung/metadata.xml
new file mode 100644
index 000000000000..9d0a422b1f4d
--- /dev/null
+++ b/app-text/glosung/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>theology</herd>
+	<maintainer>
+		<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..2d24e0a47ab2
--- /dev/null
+++ b/app-text/gnome-doc-utils/Manifest
@@ -0,0 +1 @@
+DIST gnome-doc-utils-0.20.10.tar.xz 526700 SHA256 cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151 WHIRLPOOL b840fd722ba7994aa587a85159cb1873c710bf5074ce7c1c6c0cfb601847b5ae3aea1584f43daa4cbcbb4d486c0b6609115191c5eacf4c23f99d42a696791011
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..5cb12617ea98
--- /dev/null
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multibuild python-r1
+
+DESCRIPTION="A collection of documentation utilities for the Gnome project"
+HOMEPAGE="http://live.gnome.org/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 ~x86-interix ~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[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
+	epatch "${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() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog NEWS README
+	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..6e0e2ecb48ca
--- /dev/null
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-text/gnopaster/Manifest b/app-text/gnopaster/Manifest
new file mode 100644
index 000000000000..6d948a03676b
--- /dev/null
+++ b/app-text/gnopaster/Manifest
@@ -0,0 +1 @@
+DIST gnopaster-0.0.9.pl.gz 2791 SHA256 894782ba23e3cc42e2ac54578f49e485706a93e72179b5b03d694d017dba66fb SHA512 db7f6ffa7e0d4d9c4fcfaf830ee0b9aa40736ef8e67b12b8de4a4a0ad9e02964fa4c5b8521fed6299c336fb7ecd7cbfe8a9f7b2b0d5ed823545b5e67ff6c48cc WHIRLPOOL 144a0b4a915164a46b91dbdedb24241537dcc60cb234c63ecc20522c6d82b07446526a0e0f1d0f877fb928a479bfefa1393aea2c89d4c1ec49416dc352d76f87
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..3c3c84516388
--- /dev/null
+++ b/app-text/gnopaster/gnopaster-0.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9f624f286da6
--- /dev/null
+++ b/app-text/gnopaster/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..3e4b47b5e4b5
--- /dev/null
+++ b/app-text/gocr/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/gocr/gocr-0.49.ebuild b/app-text/gocr/gocr-0.49.ebuild
new file mode 100644
index 000000000000..c354feb2e830
--- /dev/null
+++ b/app-text/gocr/gocr-0.49.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4b86ea6bb7d8
--- /dev/null
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/gocr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
new file mode 100644
index 000000000000..1a5b715e2607
--- /dev/null
+++ b/app-text/goldendict/Manifest
@@ -0,0 +1 @@
+DIST goldendict-1.0.1-src.tar.bz2 2705932 SHA256 b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6 SHA512 6c35f804063e14ffc9fe9fbd86e710582c550d10fcabb83e7fb0f65ccad1e18eaa31578a96f0aea67276453239b8035f5a694c7d081f9a6f7a822d2b75ebce55 WHIRLPOOL f642692c5ac921d031e89a4512ac63eb665d5b3d02f2a4aea911566131188f877c173d4624eef073e3580e30d8291c1f0196d870738daf2be469783838305c4c
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/goldendict-1.0.1.ebuild b/app-text/goldendict/goldendict-1.0.1.ebuild
new file mode 100644
index 000000000000..c4c1adab7a20
--- /dev/null
+++ b/app-text/goldendict/goldendict-1.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="ar_SA bg_BG cs_CZ de_DE el_GR it_IT lt_LT ru_RU uk_UA vi_VN zh_CN"
+
+inherit l10n qt4-r2
+
+DESCRIPTION="Feature-rich dictionary lookup program"
+HOMEPAGE="http://goldendict.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug kde"
+
+RDEPEND="
+	>=app-text/hunspell-1.2
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+	>=dev-qt/qtcore-4.5:4[exceptions,qt3support]
+	>=dev-qt/qtgui-4.5:4[exceptions,qt3support]
+	>=dev-qt/qtwebkit-4.5:4[exceptions]
+	!kde? ( || (
+		>=dev-qt/qtphonon-4.5:4[exceptions]
+		media-libs/phonon[qt4]
+	) )
+	kde? ( media-libs/phonon[qt4] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}
+
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	l10n_for_each_disabled_locale_do editpro
+
+	# do not install duplicates
+	sed -e '/[icon,desktop]s2/d' -i ${PN}.pro || die
+
+	# fix desktop file
+	sed -e '/^Categories=/s/;Applications$/;/' -i redist/${PN}.desktop || die
+}
+
+src_configure() {
+	PREFIX="${EPREFIX}"/usr eqmake4
+}
+
+src_install() {
+	qt4-r2_src_install
+	l10n_for_each_locale_do insqm
+}
+
+editpro() {
+	sed -e "s;locale/${1}.ts;;" -i ${PN}.pro || die
+}
+
+insqm() {
+	insinto /usr/share/apps/${PN}/locale
+	doins locale/${1}.qm
+}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
new file mode 100644
index 000000000000..c438ed871d3a
--- /dev/null
+++ b/app-text/goldendict/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>nikoli@gmx.us</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">goldendict</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..cd980310ad5d
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -0,0 +1,2 @@
+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
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..a07d562eec6c
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..554a7c22a685
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/app-text/groonga-normalizer-mysql/metadata.xml
new file mode 100644
index 000000000000..c4773445434b
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/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>
+<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..d2f9b0763790
--- /dev/null
+++ b/app-text/groonga/Manifest
@@ -0,0 +1,2 @@
+DIST groonga-4.0.7.tar.gz 10990151 SHA256 ec1d19b05c7a592a316e845ff4c5549c6236cc7ea83423c0fc7831c16161bbbf SHA512 942c28205ffb2c7d3ba767ff68b342ef5b7b9fef72131782635e86682c82a4ea3dad9d5263a42563ded22db573015c9859e49dc20c812f7a6534478b22d8b9a8 WHIRLPOOL 2473c14bcc50c87bfb925e73cc3c4cd2c02915ac498a5e40aeee312ac9873857406e38e8146fabe722250f2d258b6444813d4c47726c16ce4cfceea35f207d3a
+DIST groonga-5.0.3.tar.gz 12421501 SHA256 d4f3e9d00cb16c0028cb32422fa666cbbfb32f47597988fd308931274d94cf52 SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158 WHIRLPOOL bbcf91770eb626dfaf5d01e04b6f4b2f4ee6fff8fad73cdca36c500560ce8d0b9dc606391b1ae0a23d2fd763ba4eddbc69f2eb8b692a5c3c59c1b21745d01de0
diff --git a/app-text/groonga/files/groonga.confd b/app-text/groonga/files/groonga.confd
new file mode 100644
index 000000000000..0e1bc318144e
--- /dev/null
+++ b/app-text/groonga/files/groonga.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+#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..758d89a4d3f5
--- /dev/null
+++ b/app-text/groonga/files/groonga.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-4.0.7-r1.ebuild b/app-text/groonga/groonga-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..cf9cba12ad44
--- /dev/null
+++ b/app-text/groonga/groonga-4.0.7-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ruby 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 )
+	ruby? ( dev-lang/ruby )
+	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
+	econf \
+		--disable-groonga-httpd \
+		--without-pcre \
+		--without-kytea \
+		--without-libstemmer \
+		--with-log-path="${EROOT}var/log/${PN}.log" \
+		--docdir="${EROOT}usr/share/doc/${P}" \
+		$(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 ruby) \
+		$(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.3.ebuild b/app-text/groonga/groonga-5.0.3.ebuild
new file mode 100644
index 000000000000..494462be877a
--- /dev/null
+++ b/app-text/groonga/groonga-5.0.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/app-text/groonga/metadata.xml
new file mode 100644
index 000000000000..606f8d933015
--- /dev/null
+++ b/app-text/groonga/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>
+<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..d40d906daf7b
--- /dev/null
+++ b/app-text/grutatxt/Manifest
@@ -0,0 +1 @@
+DIST Grutatxt-2.0.16.tar.gz 29929 SHA256 38c6c78e269ea8a6cbf384af812026216005d43f683e26c5bb1af47eb24d5960 SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512 WHIRLPOOL 99c9f05c8f9d7df3382ee992c6a131ac295602f546b898c04cd2a5e9f25c0daed8469225dbe450883888f1fbe6ee913d80d24cac9248ad78c49d88d41296b04f
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..084b2926da48
--- /dev/null
+++ b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
new file mode 100644
index 000000000000..780768af9783
--- /dev/null
+++ b/app-text/gtkspell/Manifest
@@ -0,0 +1,2 @@
+DIST gtkspell-2.0.16.tar.gz 351277 SHA256 8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d WHIRLPOOL 58dc258297412b99185f8d284fb4d2ab71ab834aa29e17a9dfb743e93271ae14d517fea2dc886112898f666104300df62b04082c307b3870de4a5d908bf2ae57
+DIST gtkspell3-3.0.4.tar.gz 420762 SHA256 fabf8e670c99c1a91996e0e33fa78b7c023f77efb3e11355cf5aa9bcdc43e4a7 SHA512 907b9321b4608ca13c55c1c3a07a648b2d5eb30f0e4a92dca1c27051af254d4ded2444fef1b941f03a96e29e389d868ee15daad4bd7016239cd0dc54bb0f4abb WHIRLPOOL fd07dfd1fc2b4d449083c6847bf2c69d8f11fce2da6a5198a505e75ce6b14b9bd0c66638b5a15c0f0ff8675914355e6f9bbafbbc2096e786f81870c6ab42c1da
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..db9eaae61a1f
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~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.4.ebuild b/app-text/gtkspell/gtkspell-3.0.4.ebuild
new file mode 100644
index 000000000000..c7842a3463bc
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+
+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 ~x86-freebsd ~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/metadata.xml b/app-text/gtkspell/metadata.xml
new file mode 100644
index 000000000000..d38dbc1104a9
--- /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>
+	<herd>gnome</herd>
+	<use>
+		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+	</use>
+	<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..d84212607680
--- /dev/null
+++ b/app-text/gtranslator/Manifest
@@ -0,0 +1,2 @@
+DIST gtranslator-2.91.6.tar.xz 2235796 SHA256 a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6 SHA512 5cb5ca318201a08b530390073a9e87be93c6fb30629e899d6d23e38a790771cacf5188a26c61584a24170a3a12e9d1670440fd3f4eb3eab2da1a76a7ec4c385f WHIRLPOOL 6241316e3b759f4d21934ca9fce06cb2e3019288d3916957b5316112eab66fea3674c4b83974afdbdc19c905da86cd65939f83e9862414b2383b8a4f397d1659
+DIST gtranslator-2.91.7.tar.xz 2835836 SHA256 2b25b45b33e4aa856953b4a5da1d98bd51a343ddb479aeae3934bfe0c3651f9d SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5 WHIRLPOOL f39557d03cd0d8d833478b8e9d356c4db6ac13a9a5ebd2c09c0bc022a383342d490762eb53b99a1f32182c348e27ab21aa5d2ef1950f19b0913584997e1cac98
diff --git a/app-text/gtranslator/gtranslator-2.91.6.ebuild b/app-text/gtranslator/gtranslator-2.91.6.ebuild
new file mode 100644
index 000000000000..8f062f9b9c1a
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.91.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="An enhanced gettext po file editor for GNOME"
+HOMEPAGE="http://gtranslator.sourceforge.net/"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="gnome spell"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4.2:3
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	>=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? (
+		${PYTHON_DEPS}
+		|| ( app-dicts/gnome-dictionary	=gnome-extra/gnome-utils-3.2* )
+		x11-libs/gtk+:3[introspection] )
+	spell? ( app-text/gtkspell:3= )"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	gnome? (
+		>=dev-libs/libpeas-1.2[gtk,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gnome-extra/gucharmap:2.90[introspection] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+# eautoreconf requires gnome-base/gnome-common, app-text/yelp-tools
+
+pkg_setup() {
+	use gnome && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_with gnome dictionary)
+		$(use_enable gnome introspection)
+		$(use_with spell gtkspell3)
+		ITSTOOL=$(type -P true)"
+
+	gnome2_src_prepare
+
+	if ! use gnome; 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
+}
diff --git a/app-text/gtranslator/gtranslator-2.91.7.ebuild b/app-text/gtranslator/gtranslator-2.91.7.ebuild
new file mode 100644
index 000000000000..e42c056cdc55
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.91.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+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="gnome spell"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2[dbus]
+	>=x11-libs/gtk+-3.4.2:3
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	>=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? (
+		${PYTHON_DEPS}
+		app-dicts/gnome-dictionary:=
+		x11-libs/gtk+:3[introspection] )
+	spell? ( app-text/gtkspell:3= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	gnome? (
+		>=dev-libs/libpeas-1.2[gtk,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gnome-extra/gucharmap:2.90[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
+
+pkg_setup() {
+	use gnome && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
+
+	gnome2_src_prepare
+
+	if ! use gnome; 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_with gnome dictionary) \
+		$(use_enable gnome introspection) \
+		$(use_with spell gtkspell)
+}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-text/gtranslator/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
new file mode 100644
index 000000000000..f824899434e4
--- /dev/null
+++ b/app-text/gv/Manifest
@@ -0,0 +1,2 @@
+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
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..218e9e295ea8
--- /dev/null
+++ b/app-text/gv/gv-3.7.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="http://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 ~x86-interix ~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..d31d030a12ba
--- /dev/null
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="http://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 ~x86-interix ~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..1fa0ca569505
--- /dev/null
+++ b/app-text/gv/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
new file mode 100644
index 000000000000..e0426f88f6a6
--- /dev/null
+++ b/app-text/hd2u/Manifest
@@ -0,0 +1 @@
+DIST hd2u-1.0.3.tgz 60024 SHA256 3c9269e4aa188ddfb1ccadbb9a1906d87f6cbb60b8a2ce71cc6c9f2082ccc890 SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc WHIRLPOOL 36ef7e7beaa27129a12c9dbb7ecbc62c048d2a4db87c68ccb8a2ba5442d9e2bfab6db6a636204331b3c213af45635f2bd6eaa33fd89c60473f684420c423ae1b
diff --git a/app-text/hd2u/files/hd2u-1.0.0-build.patch b/app-text/hd2u/files/hd2u-1.0.0-build.patch
new file mode 100644
index 000000000000..66b32bbc17c7
--- /dev/null
+++ b/app-text/hd2u/files/hd2u-1.0.0-build.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile.in b/Makefile.in
+index 328016c..f8cc6aa 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -36,7 +36,7 @@ LIBS= @LIBS@
+ all:	$(TARGET)
+ 
+ $(TARGET):	$(TARGET).c config.h
+-	$(CC) $(CFLAGS) -o $@ $(@:%=%.c) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(@:%=%.c) $(LIBS)
+ 
+ rebuild:	cleanall $(TARGET)
+ 
+@@ -59,9 +59,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/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..d7a191df3a5f
--- /dev/null
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..40149c995561
--- /dev/null
+++ b/app-text/hd2u/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>shell-tools</herd>
+</pkgmetadata>
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
new file mode 100644
index 000000000000..3041e28931f0
--- /dev/null
+++ b/app-text/highlight/Manifest
@@ -0,0 +1,6 @@
+DIST highlight-3.12.tar.bz2 679786 SHA256 32f22fc63243c48ee7499c7834af50de4ed0ec84b12bd9acfaf7649e36083000 SHA512 850f59ebab9da6f38b0e42bdcdee1dd182cac31fcb8523ef88d0600cc44b682230e365918d3b97fd06ad167fcaaf69fbc0315bc848d485bcb071ff8009b10bf5 WHIRLPOOL 8fdb8eaa64ec16cc51d41dded86f0da833b7e07d92b697c0b6580f89a1cefbb9b102fe113e1f45b1289b09ad422d41f4282e4f2b3a241e7041d409456fa81353
+DIST highlight-3.16.tar.bz2 613356 SHA256 994e8da0b86549fb16c4590769731315d01db68e973c44d43931fcc628e79d77 SHA512 b637107f589ff475bda22e14a7a55a5af5adbae67a5c1b9081bd312646dc712ee8b9e04d3f760e485d4c311b0ef69ef71a5121ab7d70e0f55d3990a5c6134443 WHIRLPOOL 09af3cc7f77e409d3bdeec3979f390e30b9ffc47484274fc326de9011b55e7b10e825586a9bc2be5aa1e73dc1ab8b3623caa408766e2f7b9efff07fff470e4fc
+DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
+DIST highlight-3.18.tar.bz2 619669 SHA256 55c6f7a5aeaac2c811078a0215b27c1c80d971bba5dff51ee74a97b3303a584b SHA512 1f939e117209e96d021216addc281ca7f265822f053f577ed7cb11b8ac9a1762bf84f8e1f9f5e67277004573b98e4b8732f48549aa674fe6801bfc1c0627b930 WHIRLPOOL e08d16d632e4193e27e2a1db530218e937f04abc03d36d1cc8d096c0511a3ccf51c61078fad0bb182b145866c6aac7d7c47818014868c2ae73254c18ad80aaf7
+DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c
+DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a
diff --git a/app-text/highlight/files/highlight-3.3-parallel-make.patch b/app-text/highlight/files/highlight-3.3-parallel-make.patch
new file mode 100644
index 000000000000..9d56c5e60eb5
--- /dev/null
+++ b/app-text/highlight/files/highlight-3.3-parallel-make.patch
@@ -0,0 +1,11 @@
+--- highlight-3.3/src/makefile.orig
++++ highlight-3.3/src/makefile
+@@ -103,7 +103,7 @@
+ highlight-gui: libhighlight.a ${GUI_OBJECTS}
+ 	cd gui-qt && \
+ 	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\"' && \
+-	make
++	$(MAKE)
+ 
+ $(OBJECTFILES) : makefile
+ 
diff --git a/app-text/highlight/highlight-3.12.ebuild b/app-text/highlight/highlight-3.12.ebuild
new file mode 100644
index 000000000000..4b0ea6ad2c7a
--- /dev/null
+++ b/app-text/highlight/highlight-3.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) 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 -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"LUA_CFLAGS="
+		"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.16.ebuild b/app-text/highlight/highlight-3.16.ebuild
new file mode 100644
index 000000000000..0dc8059d950b
--- /dev/null
+++ b/app-text/highlight/highlight-3.16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) 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.17.ebuild b/app-text/highlight/highlight-3.17.ebuild
new file mode 100644
index 000000000000..0dc8059d950b
--- /dev/null
+++ b/app-text/highlight/highlight-3.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) 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.18.ebuild b/app-text/highlight/highlight-3.18.ebuild
new file mode 100644
index 000000000000..df1763b6c626
--- /dev/null
+++ b/app-text/highlight/highlight-3.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) 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.3.ebuild b/app-text/highlight/highlight-3.3.ebuild
new file mode 100644
index 000000000000..ea46449a7a77
--- /dev/null
+++ b/app-text/highlight/highlight-3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs eutils qt4-r2
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) 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 ~s390 ~sh ~sparc x86 ~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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"DESTDIR=${ED}"
+		"PREFIX=${EPREFIX}/usr"
+		"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=\\\"/usr/share/${PN}/\\\" CONFIG_DIR=\\\"/etc/${PN}/\\\" DOC_DIR=\\\"/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.9.ebuild b/app-text/highlight/highlight-3.9.ebuild
new file mode 100644
index 000000000000..d0131aaa5e7e
--- /dev/null
+++ b/app-text/highlight/highlight-3.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs qt4-r2
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) 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"
+
+src_prepare() {
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"LUA_CFLAGS="
+		"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..21ff3a538481
--- /dev/null
+++ b/app-text/highlight/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/hnb/Manifest b/app-text/hnb/Manifest
new file mode 100644
index 000000000000..cd42b75ebce4
--- /dev/null
+++ b/app-text/hnb/Manifest
@@ -0,0 +1 @@
+DIST hnb-1.9.18.tar.gz 166043 SHA256 b9a1e567d904dc9d3eb262e4f6fd46a4494339452333c35d77e154c7b0d5031f SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f WHIRLPOOL 713bb592a3122e7fcaad0a6378134dbf6055d41004020bef4ddff0d1ac59ff596337b41b54792726cb170c8155ac4bf2ce4e9d0ebddb1ea5f403c0802e45330e
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..4b9be7f51039
--- /dev/null
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8ce796e6b99c
--- /dev/null
+++ b/app-text/hnb/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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>
+</pkgmetadata>
diff --git a/app-text/htag/Manifest b/app-text/htag/Manifest
new file mode 100644
index 000000000000..8e3766b33ade
--- /dev/null
+++ b/app-text/htag/Manifest
@@ -0,0 +1 @@
+DIST htag-0.0.24.tar.gz 33602 SHA256 445ee5732d37755d4fa0b8baf3f3d9a2770288b60e703c7ee169fb96fa772b50 SHA512 28f3cae3bbaaecc2f61ca1d50b4d2e56e4bcddf2644aa37566019bd116ab653b019a5b048aac2b8a07faf6b906ac94164c81ac082c675602bd921dff62bf4858 WHIRLPOOL efced4ad02a028f5b7a437c6eaaf0daf69ba9f08c6cb4434e276c7eacf2afe11ad6f96347eebc1676d7c8d191f8ab22549bf5deef3c426a9cc9ecbe89a5a55c3
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..9866d2f5feae
--- /dev/null
+++ b/app-text/htag/htag-0.0.24-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f23b9cae1593
--- /dev/null
+++ b/app-text/htag/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+</pkgmetadata>
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
new file mode 100644
index 000000000000..2208f99a39f2
--- /dev/null
+++ b/app-text/html-xml-utils/Manifest
@@ -0,0 +1,2 @@
+DIST html-xml-utils-6.8.tar.gz 310688 SHA256 f09b7de5e427ea930ed9ceaf0ee7e6a816cf51113149a040fa84a1664ddfa189 SHA512 f4e942636064727da08b32989353e7d260d981363346f7654d65aa561aa01a1e70c478fbc9257bc5d027d34dc62d896c29dc7bff8d50c67b382387d540395546 WHIRLPOOL e31796f24fcf173da2e29d9e0f2f45be54de468fc8a93b56380a7e0ad25d9e61b78cf9b643b77e62820ec6bfc4dfa78c14f13204df0c3210c69bde411a95e645
+DIST html-xml-utils-6.9.tar.gz 311449 SHA256 9cf401dc84ca01752adf1f2d9862c4f227bb089504ed9d03d7fd40603e87fab2 SHA512 590a04e91130d7daecc4c1935808d872f3d49967be345060039bae5986b70be3be40104bc215524017a08c5492671a1fd96b63028f26f84faa400a9fbd283778 WHIRLPOOL b89b0bf5225256af2a0464429f2aa7eb1171ea982afc02ae0377e7cbd0633ee33cd39069bb0cd9056c712c20e7568b3716e448b1b8e47a9eb92193076734c353
diff --git a/app-text/html-xml-utils/html-xml-utils-6.8.ebuild b/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
new file mode 100644
index 000000000000..1c53a49124ec
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_prepare() {
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
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..2fd018393cf8
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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/metadata.xml b/app-text/html-xml-utils/metadata.xml
new file mode 100644
index 000000000000..8653502db3ff
--- /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>
+		<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..c957bd863405
--- /dev/null
+++ b/app-text/html2text/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/app-text/html2text/files/html2text-1.3.2-compiler.patch b/app-text/html2text/files/html2text-1.3.2-compiler.patch
new file mode 100644
index 000000000000..ede0e7b57069
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2-compiler.patch
@@ -0,0 +1,14 @@
+--- configure.old	2005-10-14 16:37:15.000000000 +0200
++++ html2text-1.3.2/configure	2005-10-14 16:41:51.000000000 +0200
+@@ -38,7 +38,10 @@
+ }
+ EOF
+ CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
++if test "x$CC" = "x"; then
++	CC='CC'
++fi
++for i in "g++" "cc" "$CC" "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-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..6bc0c4778c90
--- /dev/null
+++ b/app-text/html2text/html2text-1.3.2a-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..47f979e2dc03
--- /dev/null
+++ b/app-text/html2text/html2text-1.3.2a.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7b03face72e4
--- /dev/null
+++ b/app-text/html2text/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jazzoslav@gmail.com</email>
+		<name>Jaroslav Rakhmatoullin</name>
+		<description>Proxied maintainer, assign bugs to him</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
new file mode 100644
index 000000000000..6d5ba68bc363
--- /dev/null
+++ b/app-text/html401/Manifest
@@ -0,0 +1 @@
+DIST html40.tgz 369830 SHA256 c5f9af793b0fa71eb94858f2cf659292779f4fba638a6cab7d23d5ea43541a1d SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e WHIRLPOOL c8435e1ee2f3d9f3cb8dc861849b9910b9b3dc33808d7f2cc95d91cd80669758534f761bf028a848dd4a97fa56f3e6a73f9bc0a1fcd03743e65cb775d15fc231
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..91ceb588c97d
--- /dev/null
+++ b/app-text/html401/html401-19991224-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
new file mode 100644
index 000000000000..a411b9557d20
--- /dev/null
+++ b/app-text/htmlc/Manifest
@@ -0,0 +1,2 @@
+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
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..942d0f5c4588
--- /dev/null
+++ b/app-text/htmlc/htmlc-2.40.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..cd09513d1f17
--- /dev/null
+++ b/app-text/htmlc/htmlc-2.60.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a273949ac559
--- /dev/null
+++ b/app-text/htmlc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ml</herd>
+</pkgmetadata>
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
new file mode 100644
index 000000000000..3ebde9562085
--- /dev/null
+++ b/app-text/htmldoc/Manifest
@@ -0,0 +1 @@
+DIST htmldoc-1.8.27-source.tar.bz2 3960271 SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613 SHA512 f0b2b6fec4925e549e74d6721f15b5de00c8c4889b0c67689945c408ed88074acb1330cae155655a1986adc0ca549cea32e242aa1ecac8e6338a1739f7c85438 WHIRLPOOL 0716ef8e70d11208668685b3b2cc742111940c91264a97531e705351721f3f14260c05479f35f73c2961238e163e0f5407c5bb2769984ccbcb5063736ebd4b39
diff --git a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch b/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
new file mode 100644
index 000000000000..b339904ae412
--- /dev/null
+++ b/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
@@ -0,0 +1,11 @@
+--- htmldoc/ps-pdf.cxx	2006-08-01 18:58:50.000000000 +0200
++++ htmldoc/ps-pdf.cxx	2008-04-26 21:19:49.000000000 +0200
+@@ -3624,7 +3624,7 @@
+   * Get the width of the page number, leave room for three dots...
+   */
+ 
+-  if (heading >= 0)
++  if (heading >= 0 && heading < num_headings)
+   {
+     hpage       = heading_pages[heading];
+     numberwidth = get_width((uchar *)pages[hpage].page_text,
diff --git a/app-text/htmldoc/files/htmldoc-fortify-fail.patch b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
new file mode 100644
index 000000000000..32ec8873567f
--- /dev/null
+++ b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
@@ -0,0 +1,21 @@
+diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
+--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
++++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
+@@ -8619,7 +8619,7 @@
+           return (NULL);
+         }
+ 	// Safe because buffer is allocated...
+-        strcpy((char *)r->data.text.buffer, (char *)data);
++        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
+         get_color(_htmlTextColor, r->data.text.rgb);
+         break;
+     case RENDER_IMAGE :
+@@ -8640,7 +8640,7 @@
+           return (NULL);
+         }
+ 	// Safe because buffer is allocated...
+-        strcpy((char *)r->data.link, (char *)data);
++        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
+         break;
+   }
+ 
diff --git a/app-text/htmldoc/files/htmldoc-libpng15.patch b/app-text/htmldoc/files/htmldoc-libpng15.patch
new file mode 100644
index 000000000000..7b834c304d26
--- /dev/null
+++ b/app-text/htmldoc/files/htmldoc-libpng15.patch
@@ -0,0 +1,116 @@
+http://bugs.gentoo.org/385521
+http://www.htmldoc.org/str.php?L243+P0+S-2+C0+I0+E0+M10+Q
+
+--- htmldoc/image.cxx
++++ htmldoc/image.cxx
+@@ -1472,6 +1472,9 @@ image_load_png(image_t *img,	/* I - Imag
+   png_bytep	*rows;		/* PNG row pointers */
+   uchar		*inptr,		/* Input pixels */
+ 		*outptr;	/* Output pixels */
++  png_bytep trans_alpha;
++  int num_trans;
++  png_color_16p trans_color;
+ 
+ 
+  /*
+@@ -1499,7 +1502,7 @@ image_load_png(image_t *img,	/* I - Imag
+ 
+   rows = NULL;
+ 
+-  if (setjmp(pp->jmpbuf)) 
++  if (setjmp(png_jmpbuf(pp))) 
+   {
+     progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
+ 
+@@ -1526,7 +1529,7 @@ image_load_png(image_t *img,	/* I - Imag
+ 
+   png_read_info(pp, info);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE)
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+   {
+     png_set_expand(pp);
+ 
+@@ -1535,15 +1538,15 @@ image_load_png(image_t *img,	/* I - Imag
+     if (Encryption)
+       img->use ++;
+   }
+-  else if (info->bit_depth < 8)
++  else if (png_get_bit_depth(pp, info) < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
++  else if (png_get_bit_depth(pp, info) == 16)
+     png_set_strip_16(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+   {
+     depth      = 3;
+     img->depth = gray ? 1 : 3;
+@@ -1554,10 +1557,11 @@ image_load_png(image_t *img,	/* I - Imag
+     img->depth = 1;
+   }
+ 
+-  img->width  = info->width;
+-  img->height = info->height;
++  img->width  = png_get_image_width(pp, info);
++  img->height = png_get_image_height(pp, info);
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color);
++  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+   {
+     if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
+       image_need_mask(img, 8);
+@@ -1571,14 +1575,14 @@ image_load_png(image_t *img,	/* I - Imag
+ 
+ #ifdef DEBUG
+   printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d, img->depth=%d\n",
+-         info->color_type, depth, img->width, img->height, img->depth);
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
++         png_get_color_type(pp, info), depth, img->width, img->height, img->depth);
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+     puts("    COLOR");
+   else
+     puts("    GRAYSCALE");
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+     puts("    ALPHA");
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE)
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+     puts("    PALETTE");
+ #endif // DEBUG
+ 
+@@ -1594,9 +1598,9 @@ image_load_png(image_t *img,	/* I - Imag
+   * Allocate pointers...
+   */
+ 
+-  rows = (png_bytep *)calloc(info->height, sizeof(png_bytep));
++  rows = (png_bytep *)calloc(png_get_image_height(pp, info), sizeof(png_bytep));
+ 
+-  for (i = 0; i < (int)info->height; i ++)
++  for (i = 0; i < (int)png_get_image_height(pp, info); i ++)
+     rows[i] = img->pixels + i * img->width * depth;
+ 
+  /*
+@@ -1610,7 +1614,7 @@ image_load_png(image_t *img,	/* I - Imag
+   * Generate the alpha mask as necessary...
+   */
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+   {
+ #ifdef DEBUG
+     for (inptr = img->pixels, i = 0; i < img->height; i ++)
+@@ -1639,7 +1643,7 @@ image_load_png(image_t *img,	/* I - Imag
+   * Reformat the data as necessary for the reader...
+   */
+ 
+-  if (gray && info->color_type & PNG_COLOR_MASK_COLOR)
++  if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+   {
+    /*
+     * Greyscale output needed...
diff --git a/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch b/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
new file mode 100644
index 000000000000..3a8d4edd31a2
--- /dev/null
+++ b/app-text/htmldoc/files/htmldoc-sscanf-overflows.patch
@@ -0,0 +1,38 @@
+Fix several insecure calls to sscanf(), bug 278186. Patch by a3li@gentoo.org.
+
+diff -ru a/htmldoc/htmllib.cxx b/htmldoc/htmllib.cxx
+--- a/htmldoc/htmllib.cxx	2006-06-07 19:43:52.000000000 +0200
++++ b/htmldoc/htmllib.cxx	2009-08-01 19:52:46.301099436 +0200
+@@ -2139,7 +2139,7 @@
+ 	  * assigned charset...
+ 	  */
+ 
+-          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%s", &width, glyph) != 2)
++          if (sscanf(line, "%*s%*s%*s%*s%f%*s%*s%63s", &width, glyph) != 2)
+ 	    continue;
+ 
+           for (ch = 0; ch < 256; ch ++)
+diff -ru a/htmldoc/ps-pdf.cxx b/htmldoc/ps-pdf.cxx
+--- a/htmldoc/ps-pdf.cxx	2006-08-01 18:58:50.000000000 +0200
++++ b/htmldoc/ps-pdf.cxx	2009-08-01 19:53:14.300610480 +0200
+@@ -12512,7 +12512,7 @@
+ 	  * assigned charset...
+ 	  */
+ 
+-	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%s", &width, glyph) != 2)
++	  if (sscanf(line, "%*s%*s%*s%*s%d%*s%*s%63s", &width, glyph) != 2)
+ 	    continue;
+ 
+ 	  for (ch = 0; ch < 256; ch ++)
+diff -ru a/htmldoc/util.cxx b/htmldoc/util.cxx
+--- a/htmldoc/util.cxx	2005-04-24 21:20:32.000000000 +0200
++++ b/htmldoc/util.cxx	2009-08-01 19:52:14.469652088 +0200
+@@ -484,7 +484,7 @@
+     PageWidth  = 595;
+     PageLength = 792;
+   }
+-  else if (sscanf(size, "%fx%f%s", &width, &length, units) >= 2)
++  else if (sscanf(size, "%fx%f%254s", &width, &length, units) >= 2)
+   {
+    /*
+     * Custom size...
diff --git a/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
new file mode 100644
index 000000000000..b863c8b5e42b
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.8.27-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+SRC_URI="http://www.msweet.org/files/project1/${P}-source.tar.bz2"
+HOMEPAGE="http://www.msweet.org/projects.php?Z1"
+
+IUSE="fltk ssl"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+
+DEPEND=">=media-libs/libpng-1.4
+	virtual/jpeg
+	fltk? ( x11-libs/fltk:1 )
+	ssl? ( >=dev-libs/openssl-0.9.6e )"
+RDEPEND="${DEPEND}"
+
+# this needs to be figured out, since htmldoc looks for all three libs
+# right now there's no virtual/ssl
+#
+#   --enable-openssl        use OpenSSL for SSL/TLS support, default=yes
+#   --enable-gnutls         use GNU TLS for SSL/TLS support, default=yes
+#   --enable-cdsassl        use CDSA for SSL/TLS support, default=yes
+
+src_prepare() {
+	# make sure not to use the libs htmldoc ships with
+	mkdir foo ; mv jpeg foo/ ; mv png foo/ ; mv zlib foo/
+
+	epatch \
+		"${FILESDIR}"/${PN}-sscanf-overflows.patch \
+		"${FILESDIR}"/${PN}-fortify-fail.patch \
+		"${FILESDIR}"/${PN}-libpng15.patch \
+		"${FILESDIR}"/${P}-crash.patch
+
+	sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \
+		configure || die
+}
+
+src_configure() {
+	local myconf="$(use_enable ssl openssl) $(use_with fltk gui)"
+	econf ${myconf}
+	# Add missing -lfltk_images to LIBS
+	if use fltk; then
+		sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs || die
+	fi
+}
+
+src_install() {
+	einstall bindir="${D}/usr/bin"
+
+	# Minor cleanups
+	mv "${D}/usr/share/doc/htmldoc" "${D}/usr/share/doc/${PF}"
+	dodir /usr/share/doc/${PF}/html
+	mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html"
+}
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/app-text/htmldoc/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>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
new file mode 100644
index 000000000000..d0978fe820c6
--- /dev/null
+++ b/app-text/htmlinc/Manifest
@@ -0,0 +1 @@
+DIST htmlinc.tar.gz 17042 SHA256 e3323552591d27ff8160e7c0e440193734637d4acaa53cf756cc9f04b4ae61a7 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c WHIRLPOOL 8aa66b48ebc0320cc45b813a4b99240d0aa60e62c43a5cf0fb56135fbcbcd33f3b7c29522face7974bc0ef2622e7d8bb2e0afdf1d7203c77365fcbacb39c777b
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..6fba64918e0c
--- /dev/null
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..59f6850d7686
--- /dev/null
+++ b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d9cd2cad66c2
--- /dev/null
+++ b/app-text/htmlinc/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/htmlrecode/Manifest b/app-text/htmlrecode/Manifest
new file mode 100644
index 000000000000..3e9342b6b3fb
--- /dev/null
+++ b/app-text/htmlrecode/Manifest
@@ -0,0 +1 @@
+DIST htmlrecode-1.3.1.tar.bz2 51387 SHA256 295c2b89d9357e1345e08cc7f33ff3d5843dec6acbffa604a11c17a1d58b61f0 SHA512 180b9c2a1214007bd3163d5df7bcf15c299f452b78f0383a01d85d48212d8ae32c2b5598f44c40ce54b332c26f3ee5c448c614fbae383ec9a326e44f69b0ad10 WHIRLPOOL 6b30e57899f4d17f0663094860be0d1d98b985881c67b73ea49394bdda0ceaf8749b0bdaa949c35bd0a661c676b4c63ba9426c1af13ea5c1ac9f61050b54f092
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..d67e5d3af170
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
new file mode 100644
index 000000000000..d0fad25877a5
--- /dev/null
+++ b/app-text/htmltidy/Manifest
@@ -0,0 +1,2 @@
+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
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-r1.ebuild b/app-text/htmltidy/htmltidy-20090325-r1.ebuild
new file mode 100644
index 000000000000..823874927025
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-20090325-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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
+
+	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..4538a68724a6
--- /dev/null
+++ b/app-text/htmltidy/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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
new file mode 100644
index 000000000000..f722dc91f051
--- /dev/null
+++ b/app-text/htp/Manifest
@@ -0,0 +1 @@
+DIST htp-1.16.tar.gz 141133 SHA256 905da83203be2d45d8bf0e454010ed73b78588dc65c0725b9ed712f01b7da8f2 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0 WHIRLPOOL 6b7d7da22fbd6768099fa333a897e4cf968becd565a41831f91fc033a74ac09ad0ada06c9fe1b26ca6bb742d61f61fe0c13c7a5da578f4db2b61fe66e37ceea8
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..ef44ec232413
--- /dev/null
+++ b/app-text/htp/htp-1.16-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5920e0eee87f
--- /dev/null
+++ b/app-text/htp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+	<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..6086c5a90c39
--- /dev/null
+++ b/app-text/hunspell/Manifest
@@ -0,0 +1 @@
+DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c SHA512 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 WHIRLPOOL c10f7f7b326ce886bd031da29e9e04a1f4a5914f24cbe75061ed539958e7a8efaa4d4ea16f2b17437c63d97d6f558a27c092bc43c9f56c75078667d5344402f8
diff --git a/app-text/hunspell/files/hunspell-1.3-renameexes.patch b/app-text/hunspell/files/hunspell-1.3-renameexes.patch
new file mode 100644
index 000000000000..70c5b748edba
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3-renameexes.patch
@@ -0,0 +1,135 @@
+=== modified file 'src/tools/Makefile.am'
+--- src/tools/Makefile.am	2011-05-24 15:55:29 +0000
++++ src/tools/Makefile.am	2011-05-24 15:58:36 +0000
+@@ -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_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,8 +6,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.3.la
+ 
+-munch_SOURCES=munch.c munch.h
+-unmunch_SOURCES=unmunch.c unmunch.h
++hunspell_munch_SOURCES=munch.c munch.h
++hunspell_unmunch_SOURCES=unmunch.c unmunch.h
+ 
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.3.la
+@@ -16,11 +16,11 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.3.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.3.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.3.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
+ 
+ noinst_PROGRAMS=example
+ 
+
+=== modified file 'src/tools/chmorph.cxx'
+--- src/tools/chmorph.cxx	2011-05-24 15:55:29 +0000
++++ src/tools/chmorph.cxx	2011-05-24 16:00:54 +0000
+@@ -19,11 +19,11 @@
+     for (int i = 1; i < 6; i++)
+ 	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);
+ 	}
+
+=== modified file 'src/tools/example.cxx'
+--- src/tools/example.cxx	2011-05-24 15:55:29 +0000
++++ src/tools/example.cxx	2011-05-24 15:55:37 +0000
+@@ -17,8 +17,8 @@
+     /* first parse the command line options */
+ 
+     if (argc < 4) {
+-        fprintf(stderr,"example (now it works with more dictionary files):\n"); 
+-        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
++        fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n"); 
++        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+         exit(1);
+     }
+   
+
+=== modified file 'src/tools/munch.c'
+--- src/tools/munch.c	2011-05-24 15:55:29 +0000
++++ src/tools/munch.c	2011-05-24 15:55:37 +0000
+@@ -42,14 +42,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);
+   }
+ 
+
+=== modified file 'src/tools/unmunch.c'
+--- src/tools/unmunch.c	2011-05-24 15:55:29 +0000
++++ src/tools/unmunch.c	2011-05-24 15:55:37 +0000
+@@ -39,14 +39,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);
+   }
+ 
+
+=== modified file 'tests/test.sh'
+--- tests/test.sh	2011-05-24 15:55:29 +0000
++++ tests/test.sh	2011-05-24 15:55:37 +0000
+@@ -34,7 +34,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*
+@@ -43,7 +43,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.3.3-multibyte-chars.patch b/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
new file mode 100644
index 000000000000..848bc8fe8950
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
@@ -0,0 +1,59 @@
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7781#31
+https://bugs.gentoo.org/518740
+
+--- src/tools/hunspell.cxx
++++ src/tools/hunspell.cxx
+@@ -710,13 +748,22 @@ if (pos >= 0) {
+ 			fflush(stdout);
+ 		} else {
+ 			char ** wlst = NULL;
+-			int ns = pMS[d]->suggest(&wlst, token);
++			int byte_offset = parser->get_tokenpos() + pos;
++			int char_offset = 0;
++			if (strcmp(io_enc, "UTF-8") == 0) {
++				for (int i = 0; i < byte_offset; i++) {
++					if ((buf[i] & 0xc0) != 0x80)
++						char_offset++;
++				}
++			} else {
++				char_offset = byte_offset;
++			}
++			int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
+ 			if (ns == 0) {
+-		    		fprintf(stdout,"# %s %d", token,
+-		    		    parser->get_tokenpos() + pos);
++		    		fprintf(stdout,"# %s %d", token, char_offset);
+ 			} else {
+ 				fprintf(stdout,"& %s %d %d: ", token, ns,
+-				    parser->get_tokenpos() + pos);
++					char_offset);
+ 				fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], io_enc));
+ 			}
+ 			for (int j = 1; j < ns; j++) {
+@@ -745,13 +792,23 @@ if (pos >= 0) {
+ 			if (root) free(root);
+ 		} else {
+ 			char ** wlst = NULL;
++			int byte_offset = parser->get_tokenpos() + pos;
++			int char_offset = 0;
++			if (strcmp(io_enc, "UTF-8") == 0) {
++				for (int i = 0; i < byte_offset; i++) {
++					if ((buf[i] & 0xc0) != 0x80)
++						char_offset++;
++				}
++			} else {
++				char_offset = byte_offset;
++			}
+ 			int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
+ 			if (ns == 0) {
+ 		    		fprintf(stdout,"# %s %d", chenc(token, io_enc, ui_enc),
+-		    		    parser->get_tokenpos() + pos);
++		    		    char_offset);
+ 			} else {
+ 				fprintf(stdout,"& %s %d %d: ", chenc(token, io_enc, ui_enc), ns,
+-				    parser->get_tokenpos() + pos);
++				    char_offset);
+ 				fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], ui_enc));
+ 			}
+ 			for (int j = 1; j < ns; j++) {
+
diff --git a/app-text/hunspell/hunspell-1.3.3.ebuild b/app-text/hunspell/hunspell-1.3.3.ebuild
new file mode 100644
index 000000000000..a83d9e4e0f36
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.3.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+
+SLOT="0"
+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 )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+# describe properly mi
+LANGS="af bg ca cs cy da de el en eo es et fo fr ga gl he hr hu ia id is it km
+ku lt lv mk ms nb nl nn pl pt pt_BR ro ru sk sl sq sv sw tn uk zu"
+
+DICT_DEP="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+	if [[ ${lang} == de ]] ; then
+		DICT_DEP+=" linguas_de? (
+			|| (
+				app-dicts/myspell-de
+				app-dicts/myspell-de-alt
+			)
+		)"
+	else
+		DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
+	fi
+	IUSE+=" linguas_${lang}"
+done
+PDEPEND="${DICT_DEP}"
+
+unset lang LANGS DICT_DEP
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+	AUTHORS.myspell README.myspell license.myspell
+)
+
+src_prepare() {
+	# 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.
+	epatch "${FILESDIR}"/${PN}-1.3-renameexes.patch \
+		"${FILESDIR}"/${PN}-1.3.3-multibyte-chars.patch
+	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
+
+	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.0,.so}
+	popd >/dev/null
+}
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
new file mode 100644
index 000000000000..69445b065e66
--- /dev/null
+++ b/app-text/hunspell/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">hunspell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
new file mode 100644
index 000000000000..4611d739e4fb
--- /dev/null
+++ b/app-text/hyperestraier/Manifest
@@ -0,0 +1 @@
+DIST hyperestraier-1.4.13.tar.gz 1014600 SHA256 92f3e76d12da79e116e4e68487ffdddfc2abe5f50f509247905414daa5c38fff SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc WHIRLPOOL 686b6de4334fc345c98239d981367247fa670eaa3dc7769d5cb71a694c278bef9ab03f7ef3260281eaa1ef4070b611c780374bb6d832c45908c86a9941a44b70
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..0de09e990768
--- /dev/null
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-opt-2 multilib
+
+IUSE="debug java mecab ruby"
+
+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-1.8.75
+	sys-libs/zlib
+	java? ( >=virtual/jre-1.4 )
+	mecab? ( app-text/mecab )
+	ruby? ( dev-lang/ruby )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	# fix for insecure runpath warning.
+	sed -i \
+		-e "/^LDENV/d" \
+		-e "/^CFLAGS/s/$/ ${CFLAGS}/" \
+		Makefile.in \
+		|| die
+	sed -i "/^JAVACFLAGS/s/$/ ${JAVACFLAGS}/" java*/Makefile.in || die
+
+}
+
+src_compile() {
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable mecab) \
+		|| die
+	emake || die
+
+	local u d
+
+	for u in java ruby; do
+		if ! use ${u}; then
+			continue
+		fi
+
+		for d in ${u}native ${u}pure; do
+			cd ${d}
+			econf || die
+			emake || die
+			cd -
+		done
+	done
+
+}
+
+src_test() {
+
+	emake -j1 check || die
+
+	local u d
+
+	for u in java ruby; do
+		if ! use ${u}; then
+			continue
+		fi
+
+		for d in ${u}native; do
+			cd ${d}
+			emake -j1 check || die
+			cd -
+		done
+	done
+
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" MYDOCS= install || die
+	dodoc ChangeLog README* THANKS
+	dohtml doc/{*.html,*.png}
+
+	local u d
+
+	for u in java ruby; do
+		if ! use ${u}; then
+			continue
+		fi
+
+		for d in ${u}native ${u}pure; do
+			cd ${d}
+			emake DESTDIR="${D}" install || die
+			cd -
+			dohtml -r doc/${d}api
+		done
+	done
+
+	if use java; then
+		java-pkg_dojar "${D}"/usr/$(get_libdir)/*.jar
+		rm -f "${D}"/usr/$(get_libdir)/*.jar
+	fi
+
+	rm -f "${D}"/usr/bin/*test
+
+}
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
new file mode 100644
index 000000000000..31c2aab356ee
--- /dev/null
+++ b/app-text/hyperestraier/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+<maintainer>
+  <email>hattya@gentoo.org</email>
+</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..e87276780b08
--- /dev/null
+++ b/app-text/info2html/Manifest
@@ -0,0 +1 @@
+DIST info2html-2.0.tar 51200 SHA256 553f4d17e7edc13e5d27ae66e27b8702e1e83691adb3505a26e3af70276f84a5 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06 WHIRLPOOL b8212904cd11434479bdca42575818c73d5eef8d4e52fb8d980533ff27bdfb22db043352ba6a435c028aadd9ef8bffae440baebc8e296d7d8c555977ec89317a
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..d81b205df614
--- /dev/null
+++ b/app-text/info2html/info2html-2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..725dac8e56c4
--- /dev/null
+++ b/app-text/info2html/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+	<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..0735bbf381e9
--- /dev/null
+++ b/app-text/iso-codes/Manifest
@@ -0,0 +1,2 @@
+DIST iso-codes-3.57.tar.xz 3773756 SHA256 dd6acd92843b69530fce535d3d6fd947ddb3802f0d5fc1bd214d1cb7d2bf5c47 SHA512 a58e48be152960d2391123e88b48f1c43e0bf0ac880a8d6a3ec7c8154e67fd40f264063cdf7106da9d261a5fb82f64d67545a17f69ec81141f10d1eb2d897424 WHIRLPOOL 9b6de080edc6c54071a8b7584de90af3554f91d77973dceb856570b2c1760ad89a807112903cd24697bab672024d319b72ce3141fdd0dc15405bf54bbd9b53ce
+DIST iso-codes-3.59.tar.xz 3771916 SHA256 63d5ef035a96223f1fc8f36b711082f806e1666852dfc4149eeca8fd435d76ed SHA512 e1ac1c4717fd5a9daf76df109dadb24daa7dbf54b09736409e4cf4162de84038ab81ad03afecd3423d288bba306bf27f1301c03912c70a258a763a72fe8a77b4 WHIRLPOOL d56e8e81c1d6668c34d83035174aad2d393f2643ed8a4ef52f379119bb0d3a214ad9bd62d4087bfde8e3e60e427b1572eb41521dd02f081bd013278b3218bbd2
diff --git a/app-text/iso-codes/iso-codes-3.57.ebuild b/app-text/iso-codes/iso-codes-3.57.ebuild
new file mode 100644
index 000000000000..5c8b9c4a1b30
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.57.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local norm loc all_locales mylinguas
+	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+	# l10n_find_plocales_changes doesn't support multiple directories
+	einfo "Looking for new locales ..."
+	for norm in ${all_norms}; do
+		pushd "${norm}" > /dev/null || die
+		for loc in *.po; do
+			all_locales+="${loc%.po} "
+		done
+		popd > /dev/null
+	done
+
+	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+	all_locales=${all_locales//[[:space:]]/ }
+	all_locales=${all_locales#[[:space:]]}
+	all_locales=${all_locales%[[:space:]]}
+	if [[ ${PLOCALES} != ${all_locales} ]]; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${all_locales}\""
+	else
+		einfo "Done"
+	fi
+
+	for norm in ${all_norms}; do
+		einfo "Preparing ${norm} ..."
+		pushd "${norm}" > /dev/null || die
+		mylinguas=
+		for loc in *.po; do
+			if use "linguas_"${loc%.po}; then
+				mylinguas+="${loc} "
+			fi
+		done
+
+		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
+		popd > /dev/null
+	done
+}
diff --git a/app-text/iso-codes/iso-codes-3.59.ebuild b/app-text/iso-codes/iso-codes-3.59.ebuild
new file mode 100644
index 000000000000..d5169d2e9133
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.59.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local norm loc all_locales mylinguas
+	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+	# l10n_find_plocales_changes doesn't support multiple directories
+	einfo "Looking for new locales ..."
+	for norm in ${all_norms}; do
+		pushd "${norm}" > /dev/null || die
+		for loc in *.po; do
+			all_locales+="${loc%.po} "
+		done
+		popd > /dev/null
+	done
+
+	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+	all_locales=${all_locales//[[:space:]]/ }
+	all_locales=${all_locales#[[:space:]]}
+	all_locales=${all_locales%[[:space:]]}
+	if [[ ${PLOCALES} != ${all_locales} ]]; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${all_locales}\""
+	else
+		einfo "Done"
+	fi
+
+	for norm in ${all_norms}; do
+		einfo "Preparing ${norm} ..."
+		pushd "${norm}" > /dev/null || die
+		mylinguas=
+		for loc in *.po; do
+			if use "linguas_"${loc%.po}; then
+				mylinguas+="${loc} "
+			fi
+		done
+
+		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+			-i Makefile.am Makefile.in || die "sed in ${norm} 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..464d8fa1123a
--- /dev/null
+++ b/app-text/iso-codes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<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..e17d061a8aef
--- /dev/null
+++ b/app-text/itex2mml/Manifest
@@ -0,0 +1 @@
+DIST itexToMML-1.5.2.tar.gz 137352 SHA256 4d2ecd61967853db68317e03fa4255dfe5058236811223a4c25990eab8154b9e SHA512 95e3b41323de9cf1cb4d3dc1ab9fd185eca6c3886e4610ac8609d5494334ac62ce7921eb42821acb56479ea2177ba57af5d9c99632253f367172d66f0d5f8042 WHIRLPOOL c2e72147b8ce3d2c09f3202b88895555dece78ad89da5f861eeaf4ddc0e577ad3578749afc836d7f6fb8df78c40e63675bc072453d82562c9bc40575011d62bc
diff --git a/app-text/itex2mml/itex2mml-1.5.2.ebuild b/app-text/itex2mml/itex2mml-1.5.2.ebuild
new file mode 100644
index 000000000000..d98e67524ef9
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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..bfcb6974f1c4
--- /dev/null
+++ b/app-text/itex2mml/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>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
new file mode 100644
index 000000000000..2c17d03cfcdb
--- /dev/null
+++ b/app-text/jabref-bin/Manifest
@@ -0,0 +1,3 @@
+DIST JabRef-2.10.jar 15223054 SHA256 bb8f001043079bd12f7f8867d725723fca33b03889af864a100d0cf5c4364ce4 SHA512 833ec41bf8d5a76892ec82f0726c5dcf6382de8b05a949b1d697dbdbb79ba727557069f3267827a7febe6ec4ead996c8de273479b8e3d0363467ec6b91e6bd3a WHIRLPOOL a8026762ae934e680f24698e5c658c03a8f6e1c0ec6d48a0ee4b3eaee9ceb93b1831777009627c02f0377333b7f96b34da4e8e36481a859a63bd3d799f5cb03e
+DIST JabRef-2.11b2.jar 15817749 SHA256 f811eb98bdef938c9aaeee5e9807c6ea28a8b4d7270df93cb6ac2cf405dc6f8c SHA512 045f33632f5aa6ef6c61cb8e16dae69f2d91f2b4b85bfce5e51bd9492ad80d41c92b093d8f6b0d67972f18fa787d626b8c6fd419c7cd4cd3249d3e40d7025bf4 WHIRLPOOL 01e9c89b644a110ec2fc1e222ff996f69a0210520cb5c2dc0f7b4c8bb16d91bb4d37358e8e76bd2cfe7630cd664ad925b62c0a46e041da2949c4655b8326250d
+DIST JabRef-2.11b3.jar 16426897 SHA256 251192bc24448886bb62dbc5d01e0c68ee345c45d83fd586db16e5562894fa78 SHA512 93f691928948346f2e3891d5a52be14159b6e0e953897d12a839026ae125bae9c97082bf8f2e160bf20fd42d7e81fa5385114c5e7800e17be07666aa4ec0f7ed WHIRLPOOL ecf0088eb1b30391851a2c30f502b34accd9d4b1e6133f2f06e6e6689160a1dcd74a7f719c3d1e7d8e489f0bcb1f5187a07403d998a0a3256bacf4cbcaa0a2fc
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..fed7d625d935
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+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_beta_rc2.ebuild b/app-text/jabref-bin/jabref-bin-2.11_beta_rc2.ebuild
new file mode 100644
index 000000000000..8c8255d001a5
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.11_beta_rc2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+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_beta_rc3-r1.ebuild b/app-text/jabref-bin/jabref-bin-2.11_beta_rc3-r1.ebuild
new file mode 100644
index 000000000000..e8d6f3380e76
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.11_beta_rc3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_beta_rc3.ebuild b/app-text/jabref-bin/jabref-bin-2.11_beta_rc3.ebuild
new file mode 100644
index 000000000000..8c8255d001a5
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.11_beta_rc3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+src_install() {
+	java-pkg_newjar JabRef-${MY_PV}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+}
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
new file mode 100644
index 000000000000..ac4685933be7
--- /dev/null
+++ b/app-text/jabref-bin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>sci</herd>
+	<maintainer>
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</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>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
new file mode 100644
index 000000000000..51ed2eb88725
--- /dev/null
+++ b/app-text/jabref/Manifest
@@ -0,0 +1 @@
+DIST JabRef-2.10-src.tar.bz2 16769469 SHA256 09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942 WHIRLPOOL db0edafb63a6c37b001b071693278c2c0054ab20ae0744147fe8b1a828f1e575b7751d5aabca05a640fc7c099ce9402df835c6e81a0c3b21b7aa700110c426de
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..d08aa1c00ccf
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-r3.ebuild b/app-text/jabref/jabref-2.10-r3.ebuild
new file mode 100644
index 000000000000..85ffc072c49e
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:4
+	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-4,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..1e25d5f01ac8
--- /dev/null
+++ b/app-text/jabref/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>sci</herd>
+	<maintainer>
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</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..adbc2d6f7a5c
--- /dev/null
+++ b/app-text/jadetex/Manifest
@@ -0,0 +1 @@
+DIST jadetex-3.13.tar.gz 103137 SHA256 115aa01dc9665c263453e51dbb099769c63e47adb5e800436950154701059cf8 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1 WHIRLPOOL e2f23146969cf107e32658cf4fc338d39c89fd720ba8f77289e003c0c70910fd0d5cfb373f8ad2f012d1cfdbf028e9d56a63f6efd5e7d65fe23639d1a01ee8e9
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..5bd4d378c0a6
--- /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-r6.ebuild b/app-text/jadetex/jadetex-3.13-r6.ebuild
new file mode 100644
index 000000000000..fc9169155a1a
--- /dev/null
+++ b/app-text/jadetex/jadetex-3.13-r6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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-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..0e2778e9301f
--- /dev/null
+++ b/app-text/jadetex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">jadetex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/jing/Manifest b/app-text/jing/Manifest
new file mode 100644
index 000000000000..ff25e5a6be4c
--- /dev/null
+++ b/app-text/jing/Manifest
@@ -0,0 +1 @@
+DIST jing-20091111.zip 3207457 SHA256 57690280aa6b5521b570aaa5fe77e1b48d84b2a1b0a24da62f9b982c4416908c SHA512 d30e5569157cfb78d711a91d5a032a8c3ed3cba5579d15cc17fe963a591b4b5f1b6ae7c7c0b8042461ff5d04572dfd6eb355537767bf3b554baa67cfe35a2813 WHIRLPOOL 83242897d32ac7f617c24f99107abc239770706d742d58a576c2d15e7dc7e61474cc5b95eae8d96547755a8c5abc16f8b8bec9904bf7b30c4dcc8bdb9f66a5a7
diff --git a/app-text/jing/files/build-patch.diff b/app-text/jing/files/build-patch.diff
new file mode 100644
index 000000000000..f60d9af34110
--- /dev/null
+++ b/app-text/jing/files/build-patch.diff
@@ -0,0 +1,23 @@
+diff -uprN src.orig/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java src/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java
+--- src.orig/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java	2004-11-07 02:12:02.231733296 +0100
++++ src/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.java	2004-11-07 02:11:40.888977888 +0100
+@@ -1,6 +1,6 @@
+ package com.thaiopensource.validate.schematron;
+ 
+-import com.icl.saxon.TransformerFactoryImpl;
++import net.sf.saxon.TransformerFactoryImpl;
+ 
+ import javax.xml.transform.TransformerFactory;
+ 
+diff -uprN src.orig/com/thaiopensource/validate/schematron/SchemaReaderImpl.java src/com/thaiopensource/validate/schematron/SchemaReaderImpl.java
+--- src.orig/com/thaiopensource/validate/schematron/SchemaReaderImpl.java	2004-11-07 02:12:02.230733448 +0100
++++ src/com/thaiopensource/validate/schematron/SchemaReaderImpl.java	2004-11-07 02:11:40.886978192 +0100
+@@ -85,7 +85,7 @@ class SchemaReaderImpl implements Schema
+   private void initTransformerFactory(TransformerFactory factory) {
+     String name = factory.getClass().getName();
+     try {
+-      if (name.equals("com.icl.saxon.TransformerFactoryImpl"))
++      if (name.equals("net.sf.saxon.TransformerFactoryImpl"))
+         factory.setAttribute("http://icl.com/saxon/feature/linenumbering",
+                              Boolean.TRUE);
+       else if (name.equals("org.apache.xalan.processor.TransformerFactoryImpl")) {
diff --git a/app-text/jing/files/build-r1.xml b/app-text/jing/files/build-r1.xml
new file mode 100644
index 000000000000..8de4f9ad16ae
--- /dev/null
+++ b/app-text/jing/files/build-r1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<project name="jing" default="jar">
+	<!-- compiles the sources -->
+	<target name="compile">
+		<mkdir dir="build" />
+	
+		<javac srcdir="src" 
+			destdir="build"
+			source="1.4">
+			<classpath>
+				<fileset dir="bin" includes="*.jar"/>
+			</classpath>
+		</javac>
+		
+		<!-- we need the *.properties at the correct 
+		     position in the jar archive!        -->
+		<copy todir="build">
+		<fileset dir="src">
+			<include name="**/*.properties" />
+		</fileset>
+		</copy>
+		<copy todir="build/META-INF">
+			<fileset dir="src/META-INF" />
+		</copy>
+	</target>
+
+	<!-- create the jar archive -->
+	<target name="jar" depends="compile">
+		<jar jarfile="bin/jing.jar"
+			basedir="build">
+		</jar>
+	</target>
+</project>
diff --git a/app-text/jing/files/jing-20030619-xerces.patch b/app-text/jing/files/jing-20030619-xerces.patch
new file mode 100644
index 000000000000..5873822b4ccb
--- /dev/null
+++ b/app-text/jing/files/jing-20030619-xerces.patch
@@ -0,0 +1,33 @@
+Only in jing-20030619: META-INF
+diff -ru jing-20030619-orig/src/com/thaiopensource/relaxng/util/JingTask.java jing-20030619/src/com/thaiopensource/relaxng/util/JingTask.java
+--- jing-20030619-orig/src/com/thaiopensource/relaxng/util/JingTask.java	2003-05-30 20:54:52.000000000 -0400
++++ jing-20030619/src/com/thaiopensource/relaxng/util/JingTask.java	2006-01-22 00:14:34.000000000 -0500
+@@ -178,4 +178,11 @@
+     filesets.addElement(set);
+   }
+ 
++  public String getXMLVersion() {
++    throw new UnsupportedOperationException();
++  }
++
++  public int getCharacterOffset() {
++    throw new UnsupportedOperationException();
++  }
+ }
+diff -ru jing-20030619-orig/src/com/thaiopensource/validate/xerces/ValidatorImpl.java jing-20030619/src/com/thaiopensource/validate/xerces/ValidatorImpl.java
+--- jing-20030619-orig/src/com/thaiopensource/validate/xerces/ValidatorImpl.java	2003-06-19 13:57:22.000000000 -0400
++++ jing-20030619/src/com/thaiopensource/validate/xerces/ValidatorImpl.java	2006-01-22 00:15:10.000000000 -0500
+@@ -330,4 +330,12 @@
+       throw (RuntimeException)nested;
+     return new SAXException(nested);
+   }
++
++  public String getXMLVersion() {
++    throw new UnsupportedOperationException();
++  }
++  public int getCharacterOffset() {
++    throw new UnsupportedOperationException();
++  }
++		 
+ }
+Only in jing-20030619/src/com/thaiopensource/validate/xerces: .ValidatorImpl.java.swp
diff --git a/app-text/jing/jing-20091111-r1.ebuild b/app-text/jing/jing-20091111-r1.ebuild
new file mode 100644
index 000000000000..a503cee41171
--- /dev/null
+++ b/app-text/jing/jing-20091111-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jing: A RELAX NG validator in Java"
+HOMEPAGE="http://thaiopensource.com/relaxng/jing.html"
+SRC_URI="http://jing-trang.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/saxon:9
+	dev-java/xalan:0
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+# Avoid bogous QA warning, no usable build.xml. The one that exists belongs to
+# the examples.
+S="${WORKDIR}/${P}/src"
+
+src_unpack() {
+	default
+
+	mkdir -p "${S}" || die
+	pushd "${S}" >/dev/null || die
+		unpack ./../src.zip
+	popd >/dev/null
+
+	# get the resourses from prebuilt jar
+	# http://code.google.com/p/jing-trang/issues/detail?id=84
+	mkdir -p "${S}"/target/classes || die
+	pushd "${S}"/target/classes >/dev/null || die
+		unpack ./../../../bin/${PN}.jar
+		find -name '*.class' -exec rm {} + || die
+	popd >/dev/null
+}
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -exec rm -v {} + || die
+
+	#remove bundled relaxng-datatype
+	rm -rv org || die
+
+	# for use with saxon:6.5
+	rm -v com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.java || die
+	sed -i -e '/OldSaxonSchemaReaderFactory/d' \
+		target/classes/META-INF/services/com.thaiopensource.validate.SchemaReaderFactory || die
+}
+
+JAVA_GENTOO_CLASSPATH="ant-core,iso-relax,relaxng-datatype,saxon-9,xalan,xerces-2,xml-commons-resolver"
+
+#src_test() {
+#	# would need some test files could probably take this from the gcj version
+#	#java -cp ${cp} com.thaiopensource.datatype.xsd.regex.test.TestDriver || die
+#	#java -cp ${cp} com.thaiopensource.datatype.relaxng.util.TestDriver || die
+#	#java -cp ${cp} com.thaiopensource.datatype.xsd.regex.test.CategoryTest \
+#	#	|| die
+#}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main com.thaiopensource.relaxng.util.Driver
+
+	use doc && dohtml ../doc/*html
+	use examples && java-pkg_doexamples ../sample
+}
diff --git a/app-text/jing/jing-20091111-r2.ebuild b/app-text/jing/jing-20091111-r2.ebuild
new file mode 100644
index 000000000000..4a19b66a0fa3
--- /dev/null
+++ b/app-text/jing/jing-20091111-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jing: A RELAX NG validator in Java"
+HOMEPAGE="http://thaiopensource.com/relaxng/jing.html"
+SRC_URI="http://jing-trang.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/saxon:9
+	dev-java/xalan:0
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+# Avoid bogous QA warning, no usable build.xml. The one that exists belongs to
+# the examples.
+S="${WORKDIR}/${P}/src"
+
+src_unpack() {
+	default
+
+	mkdir -p "${S}" || die
+	pushd "${S}" >/dev/null || die
+		unpack ./../src.zip
+	popd >/dev/null
+
+	# get the resourses from prebuilt jar
+	# http://code.google.com/p/jing-trang/issues/detail?id=84
+	mkdir -p "${S}"/target/classes || die
+	pushd "${S}"/target/classes >/dev/null || die
+		unpack ./../../../bin/${PN}.jar
+		find -name '*.class' -exec rm {} + || die
+	popd >/dev/null
+}
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -exec rm -v {} + || die
+
+	#remove bundled relaxng-datatype
+	rm -rv org || die
+
+	# for use with saxon:6.5
+	rm -v com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.java || die
+	sed -i -e '/OldSaxonSchemaReaderFactory/d' \
+		target/classes/META-INF/services/com.thaiopensource.validate.SchemaReaderFactory || die
+}
+
+JAVA_GENTOO_CLASSPATH="ant-core,iso-relax,relaxng-datatype,saxon-9,xalan,xerces-2,xml-commons-resolver"
+
+#src_test() {
+#	# would need some test files could probably take this from the gcj version
+#	#java -cp ${cp} com.thaiopensource.datatype.xsd.regex.test.TestDriver || die
+#	#java -cp ${cp} com.thaiopensource.datatype.relaxng.util.TestDriver || die
+#	#java -cp ${cp} com.thaiopensource.datatype.xsd.regex.test.CategoryTest \
+#	#	|| die
+#}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main com.thaiopensource.relaxng.util.Driver
+
+	use doc && dohtml ../doc/*html
+	use examples && java-pkg_doexamples ../sample
+}
diff --git a/app-text/jing/metadata.xml b/app-text/jing/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/app-text/jing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/app-text/jist/Manifest b/app-text/jist/Manifest
new file mode 100644
index 000000000000..299ad07ae475
--- /dev/null
+++ b/app-text/jist/Manifest
@@ -0,0 +1 @@
+DIST jist-1.5.1.gem 13824 SHA256 0969d1c53b4e1be607f96afe8d0bc7662c9c80d79eea5a2e452ac712a2e06b81 SHA512 e59a0c5a5b0439a5cc3b847de3cbb0b9991685c1403fd8482ffd5564a77c8812587a7384ac19bb77cb812d0ece63df8ccd029c8757a242dc50a44da3e66b9936 WHIRLPOOL 1d246b371142476ba6550f01b7c0036c5c80af6985f80dbc7ba3d963543ace1957e7ae3e77e9c7f5ea4072823bfe1bdded1b808e60ec78aee411e16c81db01e5
diff --git a/app-text/jist/jist-1.5.1.ebuild b/app-text/jist/jist-1.5.1.ebuild
new file mode 100644
index 000000000000..88543c36288d
--- /dev/null
+++ b/app-text/jist/jist-1.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby gem to publish a gist"
+HOMEPAGE="http://github.com/ConradIrwin/jist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/json"
diff --git a/app-text/jist/metadata.xml b/app-text/jist/metadata.xml
new file mode 100644
index 000000000000..5cf15b097572
--- /dev/null
+++ b/app-text/jist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ruby</herd>
+  <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..7fbfc73bfae1
--- /dev/null
+++ b/app-text/jmupdf/Manifest
@@ -0,0 +1,2 @@
+DIST 2012-01-24-src-jmupdf-0.3.0.7z 4171032 SHA256 e2687e779de545c3c0692e3c19cf5ceb70fa1b04ce0dba2e3f5d0956113b817f SHA512 c4c296998f4c837accc5219e617176748f141fef42eb49f1a89638f915331bae0d87684d2e02b590691dae6684095083e329734ecdd578edd6d15ba9981aab5c WHIRLPOOL c6dd8da8452e749c8126ac488ed9ac527f898dcec9c3694a5be529d90a08d08f1362294f567a84075b9595049607619621cbf3b1055f4de7d64e76703e944aac
+DIST 2012-02-23-source-jmupdf-0.4.1.7z 4212084 SHA256 cb7311021dce6e1e7425b088f4d60c12f43c0e26eff794b057d78e105cdbbbc0 SHA512 f16190d02f9c3f6fe9aa2acd7bd270b6e807b61e926cd1bc4e17628f2d62a45d0f024c2748e4eb0a20e7da55895289f6c74685cb371e101a0901235a48eb1f42 WHIRLPOOL e8e93d303e925d1c1313d9951b3306d01abcb9ce1bca50fb40054e807c67f0347ee7c2375de11fde4f957f56fdc98e70620698fb3a02ff8a9f651fb6a21ffe86
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.3.0.ebuild b/app-text/jmupdf/jmupdf-0.3.0.ebuild
new file mode 100644
index 000000000000..a039d8a10367
--- /dev/null
+++ b/app-text/jmupdf/jmupdf-0.3.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-01-24-src-${P}.7z"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+S=${WORKDIR}/${PN}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.4.1-build-xml.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-0.4.1.ebuild b/app-text/jmupdf/jmupdf-0.4.1.ebuild
new file mode 100644
index 000000000000..08a2b4bb77ec
--- /dev/null
+++ b/app-text/jmupdf/jmupdf-0.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="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..7a24be5c8613
--- /dev/null
+++ b/app-text/jmupdf/jmupdf-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1e6990819e10
--- /dev/null
+++ b/app-text/jmupdf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</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/jpdftweak/Manifest b/app-text/jpdftweak/Manifest
new file mode 100644
index 000000000000..49cd3d3d21a6
--- /dev/null
+++ b/app-text/jpdftweak/Manifest
@@ -0,0 +1 @@
+DIST jpdftweak-src-0.9.zip 129611 SHA256 d909656b87c021f62022ffbd21ce1aaf67b27144fb2ffc5b2313dec2a79388af SHA512 55e68ba13876f2ac24b635af955d3054fed00135f05532625f40a245cc39176398bf6c0bf4a393e9e475604933727a7fdb270b94b38390b8ca9a41447d6652f7 WHIRLPOOL 1e902a0ef5beaac1a856ad0c7e2494bf4735fcc4e653609a39c3c65a078de12306b4868cf6ecab9895ea854e420b04b1f6f70dd77019b23340405117de38affd
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..541548b713c3
--- /dev/null
+++ b/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..554ee22ae343
--- /dev/null
+++ b/app-text/jpdftweak/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..34a8f59c4f1c
--- /dev/null
+++ b/app-text/kbibtex/Manifest
@@ -0,0 +1 @@
+DIST kbibtex-0.5.1.tar.xz 250224 SHA256 8e3717721ecf29a864142df302f8c6a029704c10832b3926fd42b19d315b6284 SHA512 e1e36f750a26196f8c0f07b51084afa69080fb57b747a98b0bc4ec16d733603b64dd0cc23b44a470467b0e7f705d7aef4c36c2171ceadaa3afd109fdfab56e55 WHIRLPOOL c0358164611fdf4526148205a9bc69dcc213ff7f6d68a92fa301c3bf934cf89b198f23aa568b956938e04eaaf54e1838cab89e977151043b205b9127da4d5be7
diff --git a/app-text/kbibtex/kbibtex-0.5.1.ebuild b/app-text/kbibtex/kbibtex-0.5.1.ebuild
new file mode 100644
index 000000000000..454833ff6699
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator kde4-base
+
+DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
+HOMEPAGE="http://home.gna.org/kbibtex/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
+	KEYWORDS="amd64 x86"
+else
+	EGIT_BRANCH="${PN}/$(get_version_component_range 1-2)"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	app-text/poppler[qt4]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	virtual/tex-base
+"
+RDEPEND="${DEPEND}
+	dev-tex/bibtex2html"
+
+S=${WORKDIR}/${P/_/-}
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/app-text/kbibtex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
new file mode 100644
index 000000000000..915f49e65994
--- /dev/null
+++ b/app-text/kchmviewer/Manifest
@@ -0,0 +1,3 @@
+DIST kchmviewer-6.0.tar.gz 310642 SHA256 81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979 SHA512 029335e4acea711f31c7d17751292c6b755504b97b73864b5d25a7a8a2853c0499658056bad9f9c0b6324f61c024feb5a943dc670fdccb37fcdee1346d7334d9 WHIRLPOOL 2b368654d50d0e553d116ca52f3b1ebe3d709a6b52933d54a54d2360c51356628d58c3cc789e32da54a5897b1cbee185380dbcbe0b6824146ec1ad39dc5c9280
+DIST kchmviewer-6.1.tar.gz 346587 SHA256 f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78 SHA512 aabcf98510a5a0cd38f3937e14c86e15b2514cf118e7d17e96a3a4779bb7c0985248f352844a021a66d482cfecdc3c405c816f71a7bec02d1765f8e4d7510126 WHIRLPOOL 1585726cdf4295a49c16733ee9a93d97d6087977dd8e151681bb73d19d34052c9a9423e3488e4152b7736ce8e9bf3cf02be26554ea6fffe2ccaaef9297f593a7
+DIST kchmviewer-7.1.tar.gz 340934 SHA256 a410d0a343d8a871cc860e2983079981806eb70cbf0c970fa1bcf5689821144f SHA512 6e98441358eab74d80adee437b1ad24dbf3e5b5a6ae4c5d7744537a169a6a64303b8e2b4bf1e636c0f6d955bdd1a59b7f1db2d45fc6dfecb6bb3a31088abce61 WHIRLPOOL 6e5bf2639057aa5f55ce25e9d457ca267b2ab015b5553e9edbc7bbe2997bc1d6ebcdadc656b06b15ada115eb196104a3770fdd68234b47bb3f352d3d6a9b23b3
diff --git a/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild b/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
new file mode 100644
index 000000000000..1f8c196310ee
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+KDE_REQUIRED="optional"
+KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr uk zh_CN zh_TW"
+KDE_LINGUAS_DIR="po"
+
+inherit base eutils fdo-mime qt4-r2 kde4-base
+
+DESCRIPTION="A feature rich chm file viewer, based on Qt"
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug kde"
+
+RDEPEND="
+	dev-libs/chmlib
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	kde? (
+		$(add_kdebase_dep kdelibs)
+		!kde-apps/okular[chm]
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" \
+		-e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
+			-i packages/CMakeLists.txt || die
+	sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
+			-i src/CMakeLists.txt || die
+	echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
+
+	sed -e "/Encoding=UTF-8/d" \
+		-i packages/kchmviewer.desktop || die "fixing .desktop file failed"
+
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${lang} ; then
+			rm ${KDE_LINGUAS_DIR}/${PN}_${lang}.po
+		fi
+	done
+}
+
+src_configure() {
+	if use kde; then
+		kde4-base_src_configure
+	else
+		eqmake4
+	fi
+}
+
+src_compile() {
+	if use kde; then
+		kde4-base_src_compile
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use kde; then
+		kde4-base_src_install
+	else
+		dobin bin/kchmviewer
+		domenu packages/kchmviewer.desktop
+		dodoc ChangeLog README
+	fi
+	doicon packages/kchmviewer.png
+	dodoc DBUS-bindings FAQ
+}
+
+pkg_postinst() {
+	use kde && kde4-base_pkg_postinst
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use kde && kde4-base_pkg_postrm
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/kchmviewer/kchmviewer-6.1.ebuild b/app-text/kchmviewer/kchmviewer-6.1.ebuild
new file mode 100644
index 000000000000..c30003fcadbb
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-6.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr uk zh_CN zh_TW"
+inherit eutils fdo-mime kde4-base qmake-utils
+
+DESCRIPTION="A feature rich chm file viewer, based on Qt"
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug kde"
+
+RDEPEND="
+	dev-libs/chmlib
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	kde? (
+		$(add_kdebase_dep kdelibs)
+		!kde-apps/okular[chm]
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_prepare() {
+	# Don't try to build a file that no longer exists
+	sed -e "/keyeventfilter.cpp/d" -i src/CMakeLists.txt || die
+
+	# Remove deprecated key
+	sed -e "/Encoding=UTF-8/d" -i packages/kchmviewer.desktop || die
+
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${lang} ; then
+			rm po/${PN}_${lang}.po
+		fi
+	done
+}
+
+src_configure() {
+	if use kde; then
+		kde4-base_src_configure
+	else
+		eqmake4
+	fi
+}
+
+src_compile() {
+	if use kde; then
+		kde4-base_src_compile
+	else
+		default
+	fi
+}
+
+src_install() {
+	dodoc DBUS-bindings FAQ
+	doicon packages/kchmviewer.png
+
+	if use kde; then
+		kde4-base_src_install
+	else
+		dobin bin/kchmviewer
+		domenu packages/kchmviewer.desktop
+		dodoc ChangeLog README
+	fi
+
+}
+
+pkg_postinst() {
+	if use kde; then
+		kde4-base_pkg_postinst
+	else
+		fdo-mime_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use kde; then
+		kde4-base_pkg_postrm
+	else
+		fdo-mime_desktop_database_update
+	fi
+}
diff --git a/app-text/kchmviewer/kchmviewer-7.1.ebuild b/app-text/kchmviewer/kchmviewer-7.1.ebuild
new file mode 100644
index 000000000000..b3a6fcc0d26b
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-7.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr uk zh_CN zh_TW"
+inherit eutils fdo-mime kde4-base qmake-utils
+
+DESCRIPTION="A feature rich chm file viewer, based on Qt"
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug kde"
+
+RDEPEND="
+	dev-libs/chmlib
+	dev-libs/libzip
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	kde? (
+		$(add_kdebase_dep kdelibs)
+		!kde-apps/okular[chm]
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_prepare() {
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${lang} ; then
+			rm po/${PN}_${lang}.po
+		fi
+	done
+
+	# fix parallel build wrt bug #527192
+	echo "src.depends = lib" >> ${PN}.pro || die
+}
+
+src_configure() {
+	if use kde; then
+		kde4-base_src_configure
+	else
+		eqmake4
+	fi
+}
+
+src_compile() {
+	if use kde; then
+		kde4-base_src_compile
+	else
+		default
+	fi
+}
+
+src_install() {
+	dodoc DBUS-bindings FAQ
+	doicon packages/kchmviewer.png
+
+	if use kde; then
+		kde4-base_src_install
+	else
+		dobin bin/kchmviewer
+		domenu packages/kchmviewer.desktop
+		dodoc ChangeLog README
+	fi
+
+}
+
+pkg_postinst() {
+	if use kde; then
+		kde4-base_pkg_postinst
+	else
+		fdo-mime_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use kde; then
+		kde4-base_pkg_postrm
+	else
+		fdo-mime_desktop_database_update
+	fi
+}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
new file mode 100644
index 000000000000..49db28713e39
--- /dev/null
+++ b/app-text/kchmviewer/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<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..8ab1432b6621
--- /dev/null
+++ b/app-text/kding/Manifest
@@ -0,0 +1 @@
+DIST kding-0.6.tar.bz2 3348783 SHA256 56c070b772b406529972648822dfb45b705980d7f74a98bd009efec72f9c7f71 SHA512 362890e95c8779d188745b41b6d7ef3050740999bf49baf98c16c73debb78fb1e57ebbeaddb902b458f00088f437b86eab398dd029626e35805e8ef6f09d0b86 WHIRLPOOL 5caf0e918dd8ac1f1eafcd04b06c3f1714092523178af6ad959c717ad0a1ca63c0b3cb46655ad8e773a702330c7699239dbce70324c3b5dfd4f9f27a12857737
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..0f8a4d5b9343
--- /dev/null
+++ b/app-text/kding/files/kding-0.6-dtd.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/338466
+
+--- doc/de/index.docbook
++++ 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">
+--- doc/en/index.docbook
++++ 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-r2.ebuild b/app-text/kding/kding-0.6-r2.ebuild
new file mode 100644
index 000000000000..2111fe24ffe4
--- /dev/null
+++ b/app-text/kding/kding-0.6-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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"
+
+PATCHES=( "${FILESDIR}"/${P}-dtd.patch )
+
+src_prepare() {
+	sed -e "/Encoding=UTF-8/d" \
+		-i resources/kding.desktop || die "fixing .desktop file failed"
+
+	kde4-base_src_prepare
+}
diff --git a/app-text/kding/metadata.xml b/app-text/kding/metadata.xml
new file mode 100644
index 000000000000..ce6f882a6f4b
--- /dev/null
+++ b/app-text/kding/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<maintainer>
+		<email>tgurr@gentoo.org</email>
+		<name>Timo Gurr</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..c2ab4653b206
--- /dev/null
+++ b/app-text/keepnote/Manifest
@@ -0,0 +1 @@
+DIST keepnote-0.7.9.tar.gz 786634 SHA256 a57f329867ab93eae156392fee7ab77a754c4fdde5bab986b74415c6932ff8dc SHA512 1d818fab1fea69b6369209dbaad403b2431352ba359d4f233ab412fd56a57e970b6b6adf63201811ce45faee471cf3521c6b4ccecc67f3befc727b2e77189ac5 WHIRLPOOL fd848310465a7d2ec664acd60c14eae0be62ed77a58682d8248c6a233e746a944e7ad6852804d035bb74b0b717e78095e81075e29ed3793133f6e35e20aa1316
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..b46534993af0
--- /dev/null
+++ b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..87c0dfde9c52
--- /dev/null
+++ b/app-text/keepnote/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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/kpaste/Manifest b/app-text/kpaste/Manifest
new file mode 100644
index 000000000000..0d2cbadcca70
--- /dev/null
+++ b/app-text/kpaste/Manifest
@@ -0,0 +1 @@
+DIST kpaste-1.0.tar.bz2 19607 SHA256 3fda8aa0efa8231b81ab863f6884999d0c1fbbc729f64979fd49a48c1651e801 SHA512 ba1e2b10192e3f5a2f8fa11ca57ec274a6b277195ba8ec41c64ea0ea4552f477c785c7894ea653137094cf3a6d041f04260006326978993d00cab1edd6c93918 WHIRLPOOL 98fa7c4d9e2eb753f1d49bf9f62dca1f80a4042a84cc3795773133b109cce95c9abf42ae080d9d2fe66448ff02d833aa6d19770f770ece618269b30f19d9d861
diff --git a/app-text/kpaste/kpaste-1.0.ebuild b/app-text/kpaste/kpaste-1.0.ebuild
new file mode 100644
index 000000000000..0333564fd291
--- /dev/null
+++ b/app-text/kpaste/kpaste-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Command-line tool to paste to paste.kde.org"
+HOMEPAGE="http://projects.kde.org/projects/playground/utils/kpaste"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin kpaste
+	dodoc README
+
+	python_fix_shebang "${ED}"usr/bin/kpaste
+}
diff --git a/app-text/kpaste/metadata.xml b/app-text/kpaste/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/app-text/kpaste/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
new file mode 100644
index 000000000000..78bccdf84096
--- /dev/null
+++ b/app-text/krop/Manifest
@@ -0,0 +1,2 @@
+DIST krop-0.4.7.tar.gz 34559 SHA256 fd44f83437ef6a1cb2933ab94e78385f9d7dd7b271d24549eadea700d93b84af SHA512 b38973b2084d1ac05d71e842137793d3569a1d46668e506e8a58eac4f7bd366db177d9f8af8243ed13cfe6f73885e0998ad91a1ded4c02f6d0d0102809476d10 WHIRLPOOL ecdf833981b922de9acee9ddc1467cfc056b91766ef8f4dcfc4b98b5b63fb55924f9df3d6aa3ac99a82ef86f2f8ef608ce7b2d62c52930d059a53b0121932d52
+DIST krop-0.4.8.tar.gz 34948 SHA256 71668fe54820ad11dc47f8caddc56e0d2553975e768bd724f26fa5f5389b0aab SHA512 440a3dff6c13eb83dc9ccbbcf672a297d66d66fbf9508e3c6ceda3b043868102afb1df3401fcf06adbea1baea92444ad0dfa2fd8e74b2d993c9fe4903c9327a1 WHIRLPOOL 65aa1d73dca26d3522d1bdf75501f25340487529057bdbbaeb90472d0d518e6e54a31e2b9f1f08c6037636cd83c4ef128444c519cafae3346c8e80489d7564dd
diff --git a/app-text/krop/krop-0.4.7.ebuild b/app-text/krop/krop-0.4.7.ebuild
new file mode 100644
index 000000000000..2650de6b624f
--- /dev/null
+++ b/app-text/krop/krop-0.4.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+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/pyPdf[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
diff --git a/app-text/krop/krop-0.4.8.ebuild b/app-text/krop/krop-0.4.8.ebuild
new file mode 100644
index 000000000000..fab8217f99b8
--- /dev/null
+++ b/app-text/krop/krop-0.4.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+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/pyPdf[${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..bdb617ccf698
--- /dev/null
+++ b/app-text/krop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+<maintainer>
+	<email>dilfridge@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
new file mode 100644
index 000000000000..bb85c1303213
--- /dev/null
+++ b/app-text/landslide/Manifest
@@ -0,0 +1,2 @@
+DIST landslide-1.1.1.tar.gz 156083 SHA256 b7860c6eef973b7deb286d8a32b95c4ccab0cb8460844299b36b0d48e9109b02 SHA512 de0ef010589150bf4fa31e9e7fc4b4261ac3cebe91cc8d02745f3ab1f723a811c8d2117cc61a95c5b21c7e34a0fd280640e13a649efb4bc0de7d15e9a2a1548b WHIRLPOOL e12706a23cff2c5785cd8c4192104c7c000c2eb342e58b110c24ad1eada720308a96ddcf94251fd93b4a42e8235ea3e52cbce075d744a8804a5c108fee49d967
+DIST landslide-1.1.3.tar.gz 151003 SHA256 5b0d7c204fef6b06c0997c02c9cb4096b1e7c80fdb548e4ceea9f3b6fa11530f SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152 WHIRLPOOL 1e56326958f41b10e32168fe4b22bf9c383b626c30e58559769c05cf515d3d3395c71ded5acd7f6c49277b5e33ae479cd4fbd570b0cc6a5be32f92c3ff361416
diff --git a/app-text/landslide/landslide-1.1.1.ebuild b/app-text/landslide/landslide-1.1.1.ebuild
new file mode 100644
index 000000000000..90197af752d4
--- /dev/null
+++ b/app-text/landslide/landslide-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit distutils python vcs-snapshot
+
+DESCRIPTION="Landslide 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"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/docutils
+	dev-python/jinja
+	dev-python/markdown
+	dev-python/pygments"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
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..a7a36c52f420
--- /dev/null
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Landslide 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..35121ff9387d
--- /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>
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">adamzap/landslide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
new file mode 100644
index 000000000000..26c6b67eff1a
--- /dev/null
+++ b/app-text/lcdf-typetools/Manifest
@@ -0,0 +1,2 @@
+DIST lcdf-typetools-2.104.tar.gz 636875 SHA256 d7985458ead0850cb9549ff1d619ffc18da5d7be892be5e1fce6048d510f0fff SHA512 0d41386787aa18e5a7a85158ebba2046480c2320cbdfeaad75092962335f8f97a0ceede1aa301197d6c971bd6be729960c636fb14a8ce21e4c7f3f0e57257388 WHIRLPOOL 327e88a89cedb4a66fe93878c68dff11cb2b1d8d189eb3107f1782e67a70444ccee2b1ee6362f189441695f5e02a334311f9458a4a3f1d752fe22d863a2f3d20
+DIST lcdf-typetools-2.97.tar.gz 616431 SHA256 761746041c669fa3673a3e90ec7a247abd0e2782bdddf0fc5d7ab70b33b6f975 SHA512 8812436843721b7134ec796549092854050d1e9017fef048a62e7aa0e866d20e9757b246dbad738cdf8d8583afada3a2db9c6c7dc2546154cafd4dcd0f27f7f2 WHIRLPOOL 767a2a74a9f9b7a0c29407178b96a1455da39239b835f59def2ae77db068655a8953362c6f8d48a8a31fb6fc40dea405c0e6eb276fe60750e9dfbb11954bd972
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.104.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.104.ebuild
new file mode 100644
index 000000000000..393241d349e5
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.104.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 || die "emake install failed"
+	dodoc NEWS README ONEWS
+}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild
new file mode 100644
index 000000000000..ea522741bd7d
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="+kpathsea"
+
+DEPEND="kpathsea? ( virtual/tex-base )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with kpathsea)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc NEWS README ONEWS
+}
diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
new file mode 100644
index 000000000000..6ea4b725c435
--- /dev/null
+++ b/app-text/lcdf-typetools/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>fonts</herd>
+<maintainer>
+  <email>aballier@gentoo.org</email>
+  <name>Alexis Ballier</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/letterize/Manifest b/app-text/letterize/Manifest
new file mode 100644
index 000000000000..1991e8c60adf
--- /dev/null
+++ b/app-text/letterize/Manifest
@@ -0,0 +1 @@
+DIST letterize-1.3.tar.gz 7772 SHA256 bd86e477770c7df04e12cd7612c1e2e3f2ac97835bfe64ca954c99bf2a47c644 SHA512 481caa2ecd487e7950faa87e1468887fbc4b3964d02ea86394489834bc6368bad590c54744d08cfa00b34b05ebab094f24a0b84ea91af4ab8e56455c6615bdb8 WHIRLPOOL 141f774c2454c3643c25f8c8025b048f7a1c57c4641d8398b45dabd4b6262011f551593946828a22af6a5d4917d51797678729680b36c63e115c056b5dac8d3b
diff --git a/app-text/letterize/letterize-1.3.ebuild b/app-text/letterize/letterize-1.3.ebuild
new file mode 100644
index 000000000000..1c061f79940a
--- /dev/null
+++ b/app-text/letterize/letterize-1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/app-text/letterize/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/letterize/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
new file mode 100644
index 000000000000..efab26d79ad9
--- /dev/null
+++ b/app-text/libabw/Manifest
@@ -0,0 +1,3 @@
+DIST libabw-0.0.2.tar.xz 307432 SHA256 d5cec855722e3c9caf451db2557aa8c81b279a562e67593477c58b02e948b594 SHA512 3c656fb7d3e2b4388ea33fbc380ffd01d03abefffa6089f21708b78da75cce71f95a067f05b389823ca3857b2ec14aae9371978062571aa74bf854c6948fcd82 WHIRLPOOL fb112e1a94b8983518ac3911215ea6f31091d922dfe4c3b80efbba747a71b100aa37aeb75753085d5cab15bb6b15541d401c0b55d29c85f716c972b1f3ff49fd
+DIST libabw-0.1.0.tar.xz 282268 SHA256 ee99b280b7af226a48fd9afd395cc10bef2d8e4f844151277e90793706dfc0c1 SHA512 209965359e1446862039c88c4199815583bbc4f63f3f0549f4261d3cb54ab0fb483480068d68a9bf9fe65fe6e3f9b0e05efe4cf8b9163efeadba129a70f93fd2 WHIRLPOOL 801eda0667c80b09f60e47c68fe759c3d245dd82d17b8d8dafe359c9bc96639dce44f18ab88dac92b338ca459dd8b69859aa795286c4fac4aab7a290213dfb22
+DIST libabw-0.1.1.tar.xz 287628 SHA256 cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a WHIRLPOOL 4672c825279b20b1df92d52950eba6344d4ca99711f050069e35503b995f05fafe597706f6587d08409af3f59a64717da365e2e6101ce23665819f25ce4da9f7
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.0.2.ebuild b/app-text/libabw/libabw-0.0.2.ebuild
new file mode 100644
index 000000000000..b686567e2c59
--- /dev/null
+++ b/app-text/libabw/libabw-0.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libabw/"
+SRC_URI="http://dev-www.libreoffice.org/src//${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libabw/libabw-0.1.0.ebuild b/app-text/libabw/libabw-0.1.0.ebuild
new file mode 100644
index 000000000000..e7642778691e
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libabw/"
+SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
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..d51442b28cfc
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+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 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"
+)
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libabw/metadata.xml b/app-text/libabw/metadata.xml
new file mode 100644
index 000000000000..5d46203011d6
--- /dev/null
+++ b/app-text/libabw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+</pkgmetadata>
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
new file mode 100644
index 000000000000..ceaa0d462cf2
--- /dev/null
+++ b/app-text/libebook/Manifest
@@ -0,0 +1,3 @@
+DIST libe-book-0.0.2.tar.bz2 409605 SHA256 c6f10ca827a2060e1a64497fbf43c5c113a07d4673f17a7c2c3da4ac6e2677ae SHA512 843fb7c92e7bedb3f7747e3baa547b14845718075c6fc5f12fdc0af91ca976014b651b8cc5960e7ae2bf7c89dcad99b9fd60712c68faccbcbd84fd0f54683e78 WHIRLPOOL 357fbac27c16d0e4cc2fb97561e8af817de65223099c6e1824a33b90a58b473aa2d379dc715c4dfd33aab168bdafa6be61b0076ad443ddb79d6be14322653591
+DIST libe-book-0.1.1.tar.bz2 466712 SHA256 90353fc60827a33b391d0b63ecfe5239229d489af99ff6ea014ede3b39fa32b5 SHA512 5d952cac33ece4481057686f89f5a953508e6d5b8ddfdb45c745f79c881cd4429ec0a8024144bfc9cc3a53f7a201f25e831f9125f7cc4fc8591563df09d1feec WHIRLPOOL ff702630f2b8e05edaba25bc2f003f21f2ba838a7876aaa03777146083cd4539479f74785a02b41e166e448de2b27e83e9816cfd8dd2d8fc7b314716929a4d8b
+DIST libe-book-0.1.2.tar.bz2 465922 SHA256 b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38 WHIRLPOOL 068e8ed47ea5ad231c47d8848157db6c0bdd03425f87f181c2b3ce23c8006a9d7e6848d9dee960d3ad0fd5dbc24f8e7a4d15249056a0ae58debbb653d10a8228
diff --git a/app-text/libebook/libebook-0.0.2.ebuild b/app-text/libebook/libebook-0.0.2.ebuild
new file mode 100644
index 000000000000..2797c91bf6c2
--- /dev/null
+++ b/app-text/libebook/libebook-0.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=app-text/libwpd-0.9.5:0.9
+	dev-libs/icu:=
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libebook/libebook-0.1.1.ebuild b/app-text/libebook/libebook-0.1.1.ebuild
new file mode 100644
index 000000000000..3f385d930dba
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils
+
+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 ~x86"
+IUSE="doc test"
+
+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}"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libebook/libebook-0.1.2.ebuild b/app-text/libebook/libebook-0.1.2.ebuild
new file mode 100644
index 000000000000..34c586e4bf45
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils
+
+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 x86"
+IUSE="doc test"
+
+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}"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libebook/metadata.xml b/app-text/libebook/metadata.xml
new file mode 100644
index 000000000000..b1538fa10966
--- /dev/null
+++ b/app-text/libebook/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<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..82a3a0376bbb
--- /dev/null
+++ b/app-text/libetonyek/Manifest
@@ -0,0 +1,4 @@
+DIST libetonyek-0.0.3.tar.xz 341276 SHA256 b5b96cd0857fc9a740d6ec737d613d95e9524103b9ab5a15bb6e645621d943e6 SHA512 9d60170e4404582e29bc3f04c4389f37fa6d1aedb2bf5f90fbc47230a02f184237cd3f49f8f578ccf92e2b28a84dd438a63f8e0c219697e15df3d47c86954a55 WHIRLPOOL 2a1334edd7843b0a8c05f04a9613fc7a580c93385f729d397224004ea07a417c6601e4295558b610a0a0458cf2d9ccd4b8d346d74d28caa490f61e59987471f1
+DIST libetonyek-0.1.1.tar.xz 338396 SHA256 9c6a5a0f15ae6cc6e2dfb2272b664dedda7918ed46f3756f9f29a72589d8c83e SHA512 a75463b1bf41eca19b3d1e9391683a42d2343b23b6bd1d69aa41c10ae0cef4d5794896976ba46ff364e7ead52c556e349c525bb12cea40242542037d60c2a2c4 WHIRLPOOL 373ae59f8cf1f88b37ab7c21ae22e9a6f5d32d23c5dc3b517e101d56c745940ecfc7ba579cd83601390895189271fa9ecc846460c8d570616a5274a634f91dac
+DIST libetonyek-0.1.2.tar.xz 346248 SHA256 58d078a76c3fd839c282244a1a7dabca81cef64be086a5c7d8470bb64208da39 SHA512 9d1ca586c313f93b31a19a47e9a050bbc5be8cac385d16f3060353b26de86ddb35a2d72694ec6d0ad043a108a7fe5d451dcd205db96822a0c0ce32a101b20e80 WHIRLPOOL aaba195fa0f7811a8ef05e64720cb37ca6a06534bcb7f6f0d75a9d35d3ca6fedc27783eb5e13607273e219c70bd4439561081702e80dc549c646a01dd58a595c
+DIST libetonyek-0.1.3.tar.xz 372884 SHA256 fe12276a62bd5f5ca4f5bfbd4938a74d097084e1f9fe173e521f63203f56f055 SHA512 912cb94e6cd63a162a8831368f953c4e6fb14b582a13a7ce93c0bcbb63b688fcbe4733dbb883d6a9faee2011ca5e888d00adda075c2a58d00858770ed68d6844 WHIRLPOOL 5fe864e37f6611c8cda92243a13e08e38ce1fd6f9544ddee7d3392fa9bfe573cd9af6ddd0ff03c7a0cee19b63c46b96398d985eaeb7367cd06aac8796d3655b8
diff --git a/app-text/libetonyek/files/libetonyek-0.0.3-comma.patch b/app-text/libetonyek/files/libetonyek-0.0.3-comma.patch
new file mode 100644
index 000000000000..1504acc4c115
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.0.3-comma.patch
@@ -0,0 +1,11 @@
+--- libetonyek-0.0.3/src/lib/KEYEnum.h	2013-12-06 09:40:36.000000000 +0100
++++ libetonyek-0.0.3/src/lib/KEYEnum.h	2013-12-15 06:21:26.372083749 +0100
+@@ -33,7 +33,7 @@
+   KEY_CAPITALIZATION_NONE,
+   KEY_CAPITALIZATION_ALL_CAPS,
+   KEY_CAPITALIZATION_SMALL_CAPS,
+-  KEY_CAPITALIZATION_TITLE,
++  KEY_CAPITALIZATION_TITLE
+ };
+ 
+ }
diff --git a/app-text/libetonyek/files/libetonyek-0.0.3-lexical_cast.patch b/app-text/libetonyek/files/libetonyek-0.0.3-lexical_cast.patch
new file mode 100644
index 000000000000..19a5aead224d
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.0.3-lexical_cast.patch
@@ -0,0 +1,56 @@
+--- libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp	2013-12-01 21:44:51.000000000 +0100
++++ libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp	2013-12-15 06:53:07.474721349 +0100
+@@ -125,7 +125,7 @@
+   return KEYSize(size.second, size.first);
+ }
+ 
+-bool KEY2ParserUtils::bool_cast(const char *const value)
++bool KEY2ParserUtils::bool_cast(const char *value)
+ {
+   KEY2Tokenizer tok;
+   switch (tok(value))
+@@ -142,6 +142,16 @@
+   return false;
+ }
+ 
++double KEY2ParserUtils::double_cast(const char *value)
++{
++  return lexical_cast<double, const char *>(value);
++}
++
++int KEY2ParserUtils::int_cast(const char *value)
++{
++  return lexical_cast<int, const char *>(value);
++}
++
+ double KEY2ParserUtils::deg2rad(double value)
+ {
+   // normalize range
+--- libetonyek-0.0.3/src/lib/KEY2ParserUtils.h	2013-10-30 22:04:38.000000000 +0100
++++ libetonyek-0.0.3/src/lib/KEY2ParserUtils.h	2013-12-15 06:50:40.296884951 +0100
+@@ -81,6 +81,8 @@
+     * @returns the boolean value of the string
+     */
+   static bool bool_cast(const char *value);
++  static double double_cast(const char *value);
++  static int int_cast(const char *value);
+ 
+   static double deg2rad(double value);
+ 
+--- libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp	2013-12-06 10:36:13.000000000 +0100
++++ libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp	2013-12-15 06:53:45.353451061 +0100
+@@ -62,12 +62,12 @@
+ 
+ optional<double> readDouble(const KEYXMLReader &reader)
+ {
+-  return readNumber<double>(reader, KEY2Token::f, &lexical_cast<double, const char *>);
++  return readNumber<double>(reader, KEY2Token::f, &KEY2ParserUtils::double_cast);
+ }
+ 
+ optional<int> readInt(const KEYXMLReader &reader)
+ {
+-  return readNumber<int>(reader, KEY2Token::i, &lexical_cast<int, const char *>);
++  return readNumber<int>(reader, KEY2Token::i, &KEY2ParserUtils::double_cast);
+ }
+ 
+ optional<KEYColor> readColor(const KEYXMLReader &reader)
diff --git a/app-text/libetonyek/libetonyek-0.0.3.ebuild b/app-text/libetonyek/libetonyek-0.0.3.ebuild
new file mode 100644
index 000000000000..d9b6c8ac26b1
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.0.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	dev-libs/boost:=
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	dev-util/gperf
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-comma.patch"
+	"${FILESDIR}/${P}-lexical_cast.patch"
+)
+
+src_prepare() {
+	[[ -d m4 ]] || mkdir "m4"
+	base_src_prepare
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.1.ebuild b/app-text/libetonyek/libetonyek-0.1.1.ebuild
new file mode 100644
index 000000000000..0a420fcb42bc
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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="
+	dev-libs/boost:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	dev-util/gperf
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	[[ -d m4 ]] || mkdir "m4"
+	base_src_prepare
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.2.ebuild b/app-text/libetonyek/libetonyek-0.1.2.ebuild
new file mode 100644
index 000000000000..963600bde52e
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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="
+	dev-libs/boost:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	dev-util/gperf
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	[[ -d m4 ]] || mkdir "m4"
+	base_src_prepare
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.3.ebuild b/app-text/libetonyek/libetonyek-0.1.3.ebuild
new file mode 100644
index 000000000000..b28954866d73
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	>=dev-util/mdds-0.12.1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	[[ -d m4 ]] || mkdir "m4"
+	base_src_prepare
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
new file mode 100644
index 000000000000..649d81202695
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	>=dev-util/mdds-0.12.1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	[[ -d m4 ]] || mkdir "m4"
+	base_src_prepare
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
new file mode 100644
index 000000000000..fb56680f3630
--- /dev/null
+++ b/app-text/libetonyek/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>openoffice</herd>
+</pkgmetadata>
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
new file mode 100644
index 000000000000..2bf0efcc5895
--- /dev/null
+++ b/app-text/libexttextcat/Manifest
@@ -0,0 +1 @@
+DIST libexttextcat-3.4.4.tar.xz 1025376 SHA256 f24c086cf3523424228ed58b9f678cc7647688822e5407d5fbc155fbfc846293 SHA512 f1f7a4292199cb6102cc56a5338b19049664ea664adc96a67a71205fe33d6a40f68b8695825fe253427575347ab6230dce5e0b703635534f32a0f70ff001eeed WHIRLPOOL 00413e249aab03720bc237f72497441586c49a24bfdc23100adce0b76585602d44f84393b90eade07eeb6c7083eb4ba5ff9f5f439148880ad7599d2db2b080e2
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..212e49baf50b
--- /dev/null
+++ b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="amd64 ~arm ~ppc 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/metadata.xml b/app-text/libexttextcat/metadata.xml
new file mode 100644
index 000000000000..5d46203011d6
--- /dev/null
+++ b/app-text/libexttextcat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+</pkgmetadata>
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
new file mode 100644
index 000000000000..77a1d4aabd3d
--- /dev/null
+++ b/app-text/libgxps/Manifest
@@ -0,0 +1 @@
+DIST libgxps-0.2.2.tar.xz 302844 SHA256 39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be SHA512 96fa462cb4bba9cdba3d8cfe416199f8d956d17397e3514aa6168c7acc865a30e9347d8f9850f16a8c2a0a83dc83f7d7d2bd1806e27a2af0914ce53fed2b4467 WHIRLPOOL cc4aeb94d3c989bb8dfc7b4912a1c8d86f46d8cef0051657d7cbdb9d565aaf0d07e65619f643246bc5abd7010e40046cd683ba36a8fa261eb3762bb8ee795b5a
diff --git a/app-text/libgxps/libgxps-0.2.2.ebuild b/app-text/libgxps/libgxps-0.2.2.ebuild
new file mode 100644
index 000000000000..19928011862c
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="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 ia64 ppc ppc64 sparc x86"
+IUSE="+introspection jpeg lcms static-libs tiff"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8
+	>=dev-libs/glib-2.24: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 )
+	lcms? ( media-libs/lcms:2 )
+	tiff? ( media-libs/tiff[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 introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms liblcms2) \
+		$(use_enable static-libs static) \
+		$(use_with tiff libtiff)
+}
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-text/libgxps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
new file mode 100644
index 000000000000..ab22ef89ef29
--- /dev/null
+++ b/app-text/liblangtag/Manifest
@@ -0,0 +1,3 @@
+DIST liblangtag-0.5.1.tar.bz2 651785 SHA256 c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b SHA512 006ed5b8621bfc4330589eeba8581dd2214a29c985f782b0c123012105ac6ea447f1d7593daec86b0126daf7929e6845208c633c63df67beca2d6201a6961bbf WHIRLPOOL 80f48834b00ba7732f07a7e88ae092a3f0f0168c3de176ad0544e130b8e0c3991a169ed4d502cdc9aff0af1fe3df43ac961d4c8517b9240b9934ea901c0626e5
+DIST liblangtag-0.5.2.tar.bz2 658800 SHA256 2b8dc5fa86486a1277c64e9b429eaf8ce0fcbef473b9123bb0374b711848f1c3 SHA512 73a40fbdef7820c3e1556b242e06e24040d048f62be8f9aeced0f12d0e606dfd8d49eb740bda4f0b07566c3d963d249c2440dbc9e865e1a3a11eb4fffcaa33a7 WHIRLPOOL fd04e243e5069723666acb1ed58fff2f33455916f76bfd871ef59de0ebd6b0ae392527bff13be09aab120bf72ab3b3af25b031cbb6097f04c3922652e0777e6a
+DIST liblangtag-0.5.6.tar.bz2 668949 SHA256 5cdec61f4ef8d4b1a198682fcdd17e88cb293549af5878d6ee4bdd55d129bd84 SHA512 60297d79b20c72a0ebf5fd685efbcb3eb2d40461cfe532fd5e4f2193c81c9037b8c69f9cb0977f640a7d8f315cb14508de9455334115b152ed30d23f91d75e52 WHIRLPOOL 0805c9dcde9802818ec4e19309eb9b09e4dfe77627fefcb190203110b9ec133083d48c0474171368e1b061612f1e06bc936d1dc1ad1ad551dd276afe3db26fb5
diff --git a/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch
new file mode 100644
index 000000000000..61bd1d041f7c
--- /dev/null
+++ b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch
@@ -0,0 +1,30 @@
+From 4a5ec00d229d9ccf293dc21ce64eb42de7e8118c Mon Sep 17 00:00:00 2001
+From: Jung-uk Kim <jkim@FreeBSD.org>
+Date: Thu, 9 May 2013 15:59:35 -0400
+Subject: [PATCH] Fix duplicate typedef introduced in 57c47aa.
+
+---
+ liblangtag/lt-trie.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/liblangtag/lt-trie.c b/liblangtag/lt-trie.c
+index d2162c9..301a6da 100644
+--- a/liblangtag/lt-trie.c
++++ b/liblangtag/lt-trie.c
+@@ -33,11 +33,11 @@ struct _lt_trie_t {
+ 	lt_iter_tmpl_t  parent;
+ 	lt_trie_node_t *root;
+ };
+-typedef struct _lt_trie_iter_t {
++struct _lt_trie_iter_t {
+ 	lt_iter_t    parent;
+ 	lt_list_t   *stack;
+ 	lt_string_t *pos_str;
+-} lt_trie_iter_t;
++};
+ 
+ /*< private >*/
+ static lt_trie_node_t *
+-- 
+1.8.2.3
+
diff --git a/app-text/liblangtag/files/liblangtag-0.5.6-musl.patch b/app-text/liblangtag/files/liblangtag-0.5.6-musl.patch
new file mode 100644
index 000000000000..e6d1d1184cea
--- /dev/null
+++ b/app-text/liblangtag/files/liblangtag-0.5.6-musl.patch
@@ -0,0 +1,25 @@
+From 6ebf5709810983dca570d9f8873293b01b4a49bc Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Mon, 20 Apr 2015 10:28:29 +0900
+Subject: [PATCH] add missing sys/types.h in lt-string.h required to build musl
+ libc to satisfy ssize_t. (fixes issue#12)
+
+---
+ liblangtag/lt-string.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/liblangtag/lt-string.h b/liblangtag/lt-string.h
+index 15724fc..c784430 100644
+--- a/liblangtag/lt-string.h
++++ b/liblangtag/lt-string.h
+@@ -18,6 +18,7 @@
+ #define __LT_STRING_H__
+ 
+ #include <liblangtag/lt-macros.h>
++#include <sys/types.h>
+ 
+ LT_BEGIN_DECLS
+ 
+-- 
+2.4.1
+
diff --git a/app-text/liblangtag/liblangtag-0.5.1.ebuild b/app-text/liblangtag/liblangtag-0.5.1.ebuild
new file mode 100644
index 000000000000..d14e7f624223
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="http://tagoh.bitbucket.org/liblangtag/"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="introspection static-libs test"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	sys-devel/gettext
+	test? ( dev-libs/check )"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc45.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable introspection)
+		$(use_enable test)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --all
+}
diff --git a/app-text/liblangtag/liblangtag-0.5.2.ebuild b/app-text/liblangtag/liblangtag-0.5.2.ebuild
new file mode 100644
index 000000000000..818d90f5e1aa
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="http://tagoh.bitbucket.org/liblangtag/"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="introspection static-libs test"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	sys-devel/gettext
+	test? ( dev-libs/check )"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable introspection)
+		$(use_enable test)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --all
+}
diff --git a/app-text/liblangtag/liblangtag-0.5.6.ebuild b/app-text/liblangtag/liblangtag-0.5.6.ebuild
new file mode 100644
index 000000000000..8eace5161d9e
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.5.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="http://tagoh.bitbucket.org/liblangtag/"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="introspection static-libs test"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	sys-devel/gettext
+	test? ( dev-libs/check )"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.6-musl.patch" )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable introspection)
+		$(use_enable test)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --all
+}
diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
new file mode 100644
index 000000000000..5aa863f210a2
--- /dev/null
+++ b/app-text/liblangtag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>openoffice</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
new file mode 100644
index 000000000000..216645364863
--- /dev/null
+++ b/app-text/libmspub/Manifest
@@ -0,0 +1,3 @@
+DIST libmspub-0.0.6.tar.xz 353356 SHA256 4cd4e3e9e3eef5ae676fa18415f3f342c17c28e5167d7354115a5cc2ea96a2f9 SHA512 270046ddda02ddbde03d2deb0c0e643be85d6bfdb2ca532f425bb2c8ae84925ec621c41205123630b9afebf603615610edd472996a3e7272fb90ca5357257b16 WHIRLPOOL 95326bd3ac495bb119eb35b479b72cc5c594f3fe8dd779c033a08f2df8b39b04f99203d0d5524dcfe56ed36fa4e227d561e49fd8ab5aa1cb7d461491483394fa
+DIST libmspub-0.1.1.tar.xz 340096 SHA256 d0ac8ec68a7546a3fd084c82024d1939937886c99b843c9fd8b62f8257c8fb5b SHA512 5f9059f6b9c0517f3e85078d5f90c8c914b17219e5d6f266baa60df0e7d03c0d015c5bfc334f51ee1885b8e17b14588519b18d5952a6338ce1b364f3afb04489 WHIRLPOOL 9719ec2022331cca6236451151b09f8850a91128e561f4077fb9b80b279a79fbf4c9a2875e488b9af548544ea796aa473885a54fec5949e97ba52dd7765a6102
+DIST libmspub-0.1.2.tar.xz 345556 SHA256 b0baabf82d20c08ad000e80fa02154ce2f2ffde1ee60240d6e3a917c3b35560f SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714 WHIRLPOOL 0ba2e79d0b9d0eecd632cba551251c40bf49331d98e9c6e657a9870bebfb4d68e755c738b0c8f3055b2c1cc8336d9ec00c98b147d3a960d3ccb63dd5fad534af
diff --git a/app-text/libmspub/libmspub-0.0.6.ebuild b/app-text/libmspub/libmspub-0.0.6.ebuild
new file mode 100644
index 000000000000..4305edd33258
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.0.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit base eutils
+
+DESCRIPTION="Library parsing the Microsoft Publisher documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${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 ppc x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	dev-libs/icu:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/boost
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	base_src_prepare
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmspub/libmspub-0.1.1.ebuild b/app-text/libmspub/libmspub-0.1.1.ebuild
new file mode 100644
index 000000000000..447b193d1a48
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Microsoft Publisher documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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}
+	virtual/pkgconfig
+	dev-libs/boost
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	base_src_prepare
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
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..8fbeab7ccd90
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Microsoft Publisher documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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}
+	virtual/pkgconfig
+	dev-libs/boost
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	base_src_prepare
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
new file mode 100644
index 000000000000..c080b7b4e2b2
--- /dev/null
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing Microsoft Publisher documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${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 ~x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/boost
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	base_src_prepare
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmspub/metadata.xml b/app-text/libmspub/metadata.xml
new file mode 100644
index 000000000000..5d46203011d6
--- /dev/null
+++ b/app-text/libmspub/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+</pkgmetadata>
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
new file mode 100644
index 000000000000..e58c265f0984
--- /dev/null
+++ b/app-text/libmwaw/Manifest
@@ -0,0 +1,4 @@
+DIST libmwaw-0.1.10.tar.xz 737680 SHA256 9a4547923c6db24e51733f91ecd74a9c479473962c94fa6ae4260e1fdd4db3dd SHA512 02c9fcaa8e71df81ccf4aeff1bc990735e1f629f7a80c1160fc8ceedcc1c53e23b7726c9e360516ebe43a730d4d38da5ecdc0b325afd2ac723dad662fd232d73 WHIRLPOOL 8858c296d13da94f7c2d13a97b7be5c43db98c596fc37779e77a4811984626f4597cd68f438bc0587a323f25c74d4d5a4a0fa5e5b564c5459c2e6101687b663f
+DIST libmwaw-0.2.0.tar.xz 808604 SHA256 c30f228681ba2fc3715c9e41fcf2c3bb2b873911acb22602ab7b2eb1eeed85bd SHA512 31a4641d30eaae8a6e4a7c38a875996c657c901efbf4b631a0575f8fa33a1bfe5c7fadfb867ba1d4c4a9ed321d304a4d1727d1d61596cedd75b6bf3bf0094094 WHIRLPOOL 81d7ad03f38d59c24fa6dcc87a586c7774c934e749becd465e8d58a54873072837c39ab52cfaf87011ddc03a24bf57aa52f804d70398c7091b42165456c22155
+DIST libmwaw-0.3.4.tar.xz 976120 SHA256 4c15e127455c35d20fb736c8941953aabf17180067cef0b4c405c1dca92bc9ea SHA512 2ea342861a6146215ee5c19ed7c90670ae9e1725b01f6a744b7234df00496cac9c3d98d1f1ec781e46ba08020a60db84eb48eb8d8b2ee5c0101e43f148996c7b WHIRLPOOL d25bf6c6cb8c0d3977cbee825c540aa85d39be5584167d6be48c9dfd4a304aa9f973c0008743d7199fb7f1f1de534aa85d9e48a00dd83ceab9f490eef9ae7d9f
+DIST libmwaw-0.3.5.tar.xz 1069012 SHA256 34fedad820078e0d51150518c51e537363d1d2d3301c203dd0cc31970281a9ef SHA512 37468ecec556eb1ace77beb36ca176675ad5c9c362409b7cf689fedfb284e5e2c9cf776337dfd3500169d3af2adb976658e6d8edac02579d59ff11f8cdb6234c WHIRLPOOL 0e6e84b9ed42be6b944fe328135d117eb61e524007a473ed259d206c8c2d2d162f075ba7f13c72f49f49fe7acd44ecfbfbaa3cc1c8eefcbd214ee2b507c8a5d0
diff --git a/app-text/libmwaw/libmwaw-0.1.10.ebuild b/app-text/libmwaw/libmwaw-0.1.10.ebuild
new file mode 100644
index 000000000000..7d213fb74996
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.1.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	>=app-text/libwpd-0.9.5:0.9
+	app-text/libwpg:0.2
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-sharedptr=boost \
+		--enable-zip \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmwaw/libmwaw-0.2.0.ebuild b/app-text/libmwaw/libmwaw-0.2.0.ebuild
new file mode 100644
index 000000000000..90a77f1798f7
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	>=app-text/libwpg-0.2.2:0.2
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-sharedptr=boost \
+		--enable-zip \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmwaw/libmwaw-0.3.4.ebuild b/app-text/libmwaw/libmwaw-0.3.4.ebuild
new file mode 100644
index 000000000000..e7c3f3a630ba
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46:=
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-sharedptr=boost \
+		--enable-zip \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmwaw/libmwaw-0.3.5.ebuild b/app-text/libmwaw/libmwaw-0.3.5.ebuild
new file mode 100644
index 000000000000..e7c3f3a630ba
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46:=
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-sharedptr=boost \
+		--enable-zip \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
new file mode 100644
index 000000000000..2b4d75034877
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="http://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"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46:=
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-sharedptr=boost \
+		--enable-zip \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
new file mode 100644
index 000000000000..37e5cc65b184
--- /dev/null
+++ b/app-text/libmwaw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<upstream>
+		<remote-id type="sourceforge">libmwaw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
new file mode 100644
index 000000000000..3843ee5114af
--- /dev/null
+++ b/app-text/libodfgen/Manifest
@@ -0,0 +1,3 @@
+DIST libodfgen-0.0.4.tar.xz 296224 SHA256 8f7a46f05417afbe957d0c3f88e375631b8651ea99bb2c231595408bc4224099 SHA512 5d637139c30ce24e11f4ae102b3374c95afb66e6300ef6f45dd4c2957b36bc3c56da53d49b2b6c8ba9bbadc118dffeab11421b85a9ba47e1ccf101bc1cd75e1d WHIRLPOOL 3382383a1a6edbdc183fe649812ee0285294845fdc5c47a8329cadf2fe0374f20189a9e6db0fc166d096c85400466ed56dcc1709e6728fe6b0e1e5b4c3f8c468
+DIST libodfgen-0.1.3.tar.xz 334744 SHA256 d3a09d987e9c0955846cad1e8a885a9c7a76bfaff75d4c1b5626844c62808eba SHA512 c93abc1ce100c38876b70c1458515086f93b1c376df905fd05d428f69e3f7c709a26c38b18583f878a7f2850b069b99917aeb44426d6decb3be3081bec039c86 WHIRLPOOL 74d17ed0320807cf4ddbd92452a59205b0195694c26692fda8c201964df3f56a38c27b65b9bcdaee58469bbf1e91c4a901903de9bb9e6c6050854678f611d2e7
+DIST libodfgen-0.1.4.tar.xz 356480 SHA256 249b5ed8e1acc0fee32b4381b31b4ad9453b674d4f13886bda5e9dd2b4a5f1e1 SHA512 b9229a6aea7dab1de2315a3632a3494bb785fafa8035e8f323176e76553f05cef8fc7b3e0b5fe6c154b4d8bd7ef69526703c580629dcac63adfd552539fcad69 WHIRLPOOL de779e605c2f15b95108df405a860a9285d756c374681df416c26dcd77f5b893c07a3e89ae6d2a62275b518c921f8a4930ff29886607aada8d6bcf0d055c9462
diff --git a/app-text/libodfgen/libodfgen-0.0.4.ebuild b/app-text/libodfgen/libodfgen-0.0.4.ebuild
new file mode 100644
index 000000000000..097b15d07c28
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	=app-text/libetonyek-0.0*
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libodfgen/libodfgen-0.1.3.ebuild b/app-text/libodfgen/libodfgen-0.1.3.ebuild
new file mode 100644
index 000000000000..63251dceaecf
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+# git://git.code.sf.net/p/libwpd/libodfgen
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libodfgen/libodfgen-0.1.4.ebuild b/app-text/libodfgen/libodfgen-0.1.4.ebuild
new file mode 100644
index 000000000000..63251dceaecf
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+# git://git.code.sf.net/p/libwpd/libodfgen
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
new file mode 100644
index 000000000000..d9557712f6c2
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
+inherit eutils
+[[ ${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}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libodfgen/metadata.xml b/app-text/libodfgen/metadata.xml
new file mode 100644
index 000000000000..62fc7320abb5
--- /dev/null
+++ b/app-text/libodfgen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<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..6d27788eb8d7
--- /dev/null
+++ b/app-text/libpaper/Manifest
@@ -0,0 +1 @@
+DIST libpaper_1.1.24.tar.gz 355272 SHA256 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b WHIRLPOOL 74a7cb6dec146104988dd5c5e0b4bf7fb776bde086c4fecf658d949e17d6701fa1b23511a7be43f01a01dcfd7c0340f23c3c9ec1c51fb7718d6b0dbf1761e75d
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..b519d2a1e5bc
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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/metadata.xml b/app-text/libpaper/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/app-text/libpaper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</pkgmetadata>
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
new file mode 100644
index 000000000000..df02906932b3
--- /dev/null
+++ b/app-text/libspectre/Manifest
@@ -0,0 +1,2 @@
+DIST libspectre-0.2.6.tar.gz 358088 SHA256 2f637c62322c8040514284c00f63a5c310a28801e7dcfbe2ba2791be4fac0dd3 SHA512 4f99afe68293e188f70a5043f0c5199123d6ab0936f196b198f1c66eff980d54a6fba093be39839180dcef82db5fd9780a9d50887e453352d7b90b986829dfb6 WHIRLPOOL 0335575a7a5a5fa5724b35456105badcb845202b0d48b03a03f292aab10959e1a4ba9d94189c935667114878f20f7a5b8cbb892bf52533b4846a5afebb1eecb7
+DIST libspectre-0.2.7.tar.gz 387947 SHA256 e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 WHIRLPOOL b59a1fea4ebd0cac13d4b5c7e76247de214761929bd71cf7879832acc4779786d764ddf2d38c5dea070f6e05c41f0d8460b8a8b11a51c35492827228740fb604
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/libspectre-0.2.6.ebuild b/app-text/libspectre/libspectre-0.2.6.ebuild
new file mode 100644
index 000000000000..b5301c96d826
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A library for rendering Postscript documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="http://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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
+	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 "${ED}" -name '*.la' -exec rm -f {} +
+}
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..920dab4b4826
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A library for rendering Postscript documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="http://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 ~x86-interix ~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
+	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/metadata.xml b/app-text/libspectre/metadata.xml
new file mode 100644
index 000000000000..9879e83b822e
--- /dev/null
+++ b/app-text/libspectre/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
new file mode 100644
index 000000000000..22cd751ae5fa
--- /dev/null
+++ b/app-text/libwpd/Manifest
@@ -0,0 +1,2 @@
+DIST libwpd-0.10.0.tar.xz 506220 SHA256 9d8ba780cb9c0aed7859c59a602138d8ab360b40f6aa655e42f5f769f2cfd32c SHA512 1d1962edd133b72ef835e1c7cf8d856cb959b231811009da14a272f20dc6ad3f9df02424791d26012bf130db05e22fa7862af355ecbaf3be30d9948aa719eba2 WHIRLPOOL 867049ca6128c9182a5df7d39189392618a1d2aae5631e518b6b5a33d6f2b08ddf2ad7b9d5fee8c8bef0edc6a6dae0cb0552475a73bf84db3a9ddeb19ae07449
+DIST libwpd-0.9.9.tar.xz 541608 SHA256 b91df4ca0ef0f456be9531c9ee07cf6a5e50a16b52002abb99e8ebef13fac2b2 SHA512 a71b4990670446270518e1318066e714c02c4a0752fba0be03037ea7bd434c5dd0219d61687448faabf7e31bc40e4e4a9d4b67d01fd362dae96322db513d79ac WHIRLPOOL c51155a0a88047abe856d0a83b05721b1629c4e5c24e68de65905ce8c735fd0144290c2739971d0118dfcf24eff47aea0f6b8b260c7eaa9af2a36cf8325d3c0a
diff --git a/app-text/libwpd/libwpd-0.10.0-r1.ebuild b/app-text/libwpd/libwpd-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..b8ffa626b8d6
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.10.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+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 ~hppa ~mips x86 ~x86-fbsd"
+IUSE="doc test +tools"
+
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.8.14-r1"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-10]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-10]"
+	fi
+}
diff --git a/app-text/libwpd/libwpd-0.10.0-r2.ebuild b/app-text/libwpd/libwpd-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..ecc9ce00e4aa
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.10.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+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 ~hppa ~mips ~x86 ~x86-fbsd"
+IUSE="doc +tools"
+
+COMMON_DEPEND="dev-libs/librevenge"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-text/libwpd-0.8.14-r1"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+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.0.ebuild b/app-text/libwpd/libwpd-0.10.0.ebuild
new file mode 100644
index 000000000000..4f56fa069236
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.10.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+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 ~hppa ~mips ~x86 ~x86-fbsd"
+IUSE="doc test +tools"
+
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.8.14-r1"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_with tools stream) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-10]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-10]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-10]"
+	fi
+}
diff --git a/app-text/libwpd/libwpd-0.9.9.ebuild b/app-text/libwpd/libwpd-0.9.9.ebuild
new file mode 100644
index 000000000000..a21e6793e3dd
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.9.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+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.9"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test +tools"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.8.14-r1"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_with tools stream) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[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..99f70c13b1d1
--- /dev/null
+++ b/app-text/libwpd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<use>
+		<flag name="tools">Build miscellaneous 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..e95d45886a2b
--- /dev/null
+++ b/app-text/libwpg/Manifest
@@ -0,0 +1,2 @@
+DIST libwpg-0.2.2.tar.xz 301000 SHA256 b49bfd77b9447534dee0d43bbdc48b4dcb09339605be21c01726243d5069a6cd SHA512 d60f8c0d29f7dbde2592d2afce1ccbe01ab10be4051d048fca0a2234f488a2764af2134ccf9ca150767d769d17dcd010433a3d977457b3a521be8f0dc628e65c WHIRLPOOL a52b90bd4c9aea2b72f615bcaaa43445dc72dad7e23f8f4667912ac3a95b729a7910b0c7608b3b47fd23a19399c72bb792432243e312d767d67c43b5c170e2f6
+DIST libwpg-0.3.0.tar.xz 300244 SHA256 6f709199235f4c061c3ffe1a5112ce6430e8434e621bf7b3e3dca16114eaf224 SHA512 5715a38f7c2b69123056288576073aa36a97f971a749cffb1b176a5c4a9f7da0b6568cdf62fc4e8ebd8204b681200c1a64e5e52cfd127af986580720914f973e WHIRLPOOL db0876540fde7533f1b73b4bd1cf08c09c9d845b822fcfa7a7d375014aee597aace4c5e4662c61449cd4c09747db4013ff225acd66c33b492d6348b7243945dc
diff --git a/app-text/libwpg/libwpg-0.2.2.ebuild b/app-text/libwpg/libwpg-0.2.2.ebuild
new file mode 100644
index 000000000000..6671576aed41
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+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.2"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+RDEPEND="app-text/libwpd:0.9[tools]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.1.3-r1"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--program-suffix=-${SLOT} \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+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.0.ebuild b/app-text/libwpg/libwpg-0.3.0.ebuild
new file mode 100644
index 000000000000..dcf6fc518f6b
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+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 ~hppa ~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} \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+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..9944566eff90
--- /dev/null
+++ b/app-text/libwpg/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>openoffice</herd>
+	<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..de1def9660b1
--- /dev/null
+++ b/app-text/libwps/Manifest
@@ -0,0 +1,4 @@
+DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6f9431b82f95da7fe9730177 SHA512 60ddc8db5a90589248a0a8f90950907ca3be3362983f6c4847670e6eaf4d7ad22a2b6795b0a1b0a1920075f25f1ffcfd581757c26bfb74deacd000e94459da34 WHIRLPOOL bc847cb65c72daa01db5d6f17a20cbaff741fab1fc7a63d789993334b7853009f59c1ca370d7d3798a26b294c96c3435664314b07ff5a2324fa7ca7980378fe8
+DIST libwps-0.3.0.tar.xz 408036 SHA256 e341d340b16b33f1b1fb66612311b3bdf664c103ebd48beb8db87b434333bef3 SHA512 e2583dd0bda832f1a56f8676fc78a7e37f20c30ab43e26d0db40b59079d34cfc525452a7e9dadcdf577ae325854b174730f862bdb373fa1c7194cd2025383b29 WHIRLPOOL a8386baef64eb152651d71c53cfea5403dd21b56a38011a97a3dc687448167e90ffccec9b26a46490722386f1dc77ec75cace5c0af011361696cbac37f3fd0ca
+DIST libwps-0.3.1.tar.xz 410376 SHA256 bb2c2a7db5121411ba705ccf3452cdce51d9798384fd9621e9702ba802878e93 SHA512 f628e6532b32331c7df0d97a9b71bf1f97347634657148b47d46ba7c2fd888d7fa9ffe52f31cfc24f86688c9c713bfaff360c7fe9f4a92d646cf8f21e7f5c2b1 WHIRLPOOL ebe35fabf22aedccfe3ca35e46971a26332040852357ea0f2241534261c77d597da38766192661ecd6fa24881e0bf9de4a80bdfea300129420d4635924434110
+DIST libwps-0.4.0.tar.xz 463456 SHA256 53f66f67869ebee273d2e9a73b8edbac7d83346e72473035a02580d8ce6c995a SHA512 5c7f1a75d93b1028a55b438c55da4faad198c76b61c83498952d8e8e5faabc757dcece8cdcfa2ca11aa9842a151e9dcbe45b118947ace31670597425225bf493 WHIRLPOOL 8a2ecc699e3f7a2f53a5db3881695da61037dfd3f9a95221e15200c088511221581695212d29a2c89a4d121be04d19c0a50f279b137431c21e05027a3df09c4b
diff --git a/app-text/libwps/libwps-0.2.9.ebuild b/app-text/libwps/libwps-0.2.9.ebuild
new file mode 100644
index 000000000000..a89ed3be45e5
--- /dev/null
+++ b/app-text/libwps/libwps-0.2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc debug static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	dev-libs/boost
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with doc docs) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libwps/libwps-0.3.0.ebuild b/app-text/libwps/libwps-0.3.0.ebuild
new file mode 100644
index 000000000000..abc5434c807e
--- /dev/null
+++ b/app-text/libwps/libwps-0.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+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"
+
+RDEPEND="
+	app-text/libwpd:0.10
+	dev-libs/boost:=
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with doc docs) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libwps/libwps-0.3.1.ebuild b/app-text/libwps/libwps-0.3.1.ebuild
new file mode 100644
index 000000000000..4fd5daf0f035
--- /dev/null
+++ b/app-text/libwps/libwps-0.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+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"
+
+RDEPEND="
+	app-text/libwpd:0.10
+	dev-libs/boost:=
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with doc docs) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libwps/libwps-0.4.0.ebuild b/app-text/libwps/libwps-0.4.0.ebuild
new file mode 100644
index 000000000000..8ec30ec4cd01
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+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"
+
+RDEPEND="
+	app-text/libwpd:0.10
+	dev-libs/boost:=
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with doc docs) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
new file mode 100644
index 000000000000..f2f0888fbc65
--- /dev/null
+++ b/app-text/libwps/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>openoffice</herd>
+	<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..007f8b6b5864
--- /dev/null
+++ b/app-text/libxmlpatch/Manifest
@@ -0,0 +1 @@
+DIST libxmlpatch-0.3.3.tar.gz 405496 SHA256 7236eec7bc450580c99c2d465ce2573687bb0229aa469e961bcbb0ffcb029d55 SHA512 2eb305ddd6aa1778bc9c9e7b8cae5f82ee05c0ed0a47bbb651209c496fff68f4e527b7d6ad1808bc8bf1f72aaa0172a12ddb140622ce87e3cd150a0ec4d35571 WHIRLPOOL 4a65435573490a7d07279ee7d7c6701ba3942c7b2340523af91481d46a1dbd4131cf19ccdcb6be0506735fe260be93e772839808b6c455781d81b8f79ec65def
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..82a861172738
--- /dev/null
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d0848ffe2eed
--- /dev/null
+++ b/app-text/libxmlpatch/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..e5c25c948f36
--- /dev/null
+++ b/app-text/linuxdoc-tools/Manifest
@@ -0,0 +1 @@
+DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 SHA512 a78c662f4bf69b68530af0176fb6b35328c004a80cc73e7ed1151d46da3a7868e4a8a61094f8c4081a686f1ed0c58bd19c2c5ad5a2b6677ddc7c686e67a71df7 WHIRLPOOL 966e47e081bf5eb35de546f7cd0522396aba306d8afbeeba55afb91f360c196b196c3271b84ae8a98d7f9a4d0460558986a8a32a824940b0340236c705490676
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch
new file mode 100644
index 000000000000..2f5b3dc4a25a
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch
@@ -0,0 +1,13 @@
+Index: linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l
+===================================================================
+--- linuxdoc-tools-0.9.21.orig/rtf-fix/rtf2rtf.l
++++ linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l
+@@ -22,7 +22,7 @@
+ 
+ %{
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch
new file mode 100644
index 000000000000..9ba731bf5843
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch
@@ -0,0 +1,38 @@
+--- rtf-fix/Makefile.orig
++++ rtf-fix/Makefile
+@@ -1,6 +1,4 @@
+-CC=gcc
+ LEX=flex
+-CFLAGS=-O
+
+ all: rtf2rtf
+
+--- sgmls-1.1/Makefile.orig	2013-03-20 13:40:43.674880678 +0400
++++ sgmls-1.1/Makefile	2013-03-20 13:40:58.558881151 +0400
+@@ -15,14 +15,11 @@
+ # Permissions mode to use for man pages.
+ MANMODE=444
+ 
+-CC=gcc
+ PROFILE=
+ INCLUDE=
+ OPTIMIZE=-O
+ DEBUG=
+ WARN=
+-CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
+-LDFLAGS=$(DEBUG) $(PROFILE)
+ # Additional libraries needed.
+ # Ultrix needs -li
+ LIBS=
+
+--- Makefile.in.orig	2013-03-20 13:43:36.900886178 +0400
++++ Makefile.in		2013-03-20 13:43:49.783886587 +0400
+@@ -48,8 +48,6 @@
+ OPTIMIZE = -O
+ DEBUG    =
+ WARN     =
+-CFLAGS   = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
+-LDFLAGS  = $(DEBUG) $(PROFILE)
+ 
+ all:
+ ifeq ($(BUILD_SGMLSASP), true)
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch
new file mode 100644
index 000000000000..8e5048e34265
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch
@@ -0,0 +1,24 @@
+--- linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm.letter	Mon Nov 26 16:09:37 2001
++++ linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm	Mon Nov 26 16:09:49 2001
+@@ -108,7 +108,7 @@
+     { option => "pass",      type => "s", short => "P" }
+   ];
+   $global->{backend}   = "linuxdoc";
+-  $global->{papersize} = "a4";
++  $global->{papersize} = "letter";
+   $global->{language}  = "en";
+   $global->{charset}   = "ascii";
+   $global->{style}     = "";
+--- linuxdoc-tools-0.9.68/man/linuxdoc.1.letter	Mon Nov 26 16:10:04 2001
++++ linuxdoc-tools-0.9.68/man/linuxdoc.1	Mon Nov 26 16:10:42 2001
+@@ -46,8 +46,8 @@
+ format, but just output the usage of this suites.
+ Available formats are: html, info, latex, lyx, rtf, tex, check.
+ .IP "--papersize=\fIsize\fR, -p
+-Set the paper size.  Default is ``a4'' (European 297x210mm paper).
+-You may also specify ``letter'' size.
++Set the paper size.  Default is ``letter''.
++You may also specify ``a4'' size (European 297x210mm paper).
+ .IP "--language=\fIlang\fR, -l"
+ Specify the language of the document (this may change which style
+ files are used for formatting by a back end).  The default language is
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch
new file mode 100644
index 000000000000..9ee97432fdc9
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-lex.patch
@@ -0,0 +1,11 @@
+--- rtf-fix/rtf2rtf.l.orig	2013-03-20 13:14:06.146829954 +0400
++++ rtf-fix/rtf2rtf.l	2013-03-20 13:14:28.193830654 +0400
+@@ -72,7 +72,7 @@
+ int skipnewline = 0;
+ 
+ extern char *yytext;
+-extern int yyleng;
++extern yy_size_t yyleng;
+ 
+ #define CHAPTER 1
+ #define SECTION 2
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
new file mode 100644
index 000000000000..0a5eaa449dcd
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils sgml-catalog toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="http://packages.qa.debian.org/l/linuxdoc-tools.html"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="MIT SGMLUG"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+
+DEPEND="app-text/openjade
+	app-text/opensp
+	app-text/sgml-common
+	dev-texlive/texlive-fontsrecommended
+	dev-lang/perl
+	sys-apps/gawk
+	sys-apps/groff
+	virtual/latex-base"
+
+RDEPEND="${DEPEND}"
+
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
+	"/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-letter.patch" \
+		"${FILESDIR}/${PN}-0.9.21-malloc.patch" \
+		"${FILESDIR}/${P}-compiler.patch" \
+		"${FILESDIR}/${P}-lex.patch"
+
+	# Wrong path for the catalog.
+	sed -i -e \
+		's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
+		perl5lib/LinuxDocTools.pm || die 'sed failed'
+
+	# Fix incorrect version string in upstream tarball
+	sed -i -e "s/0.9.66/${PV}/" VERSION || die 'sed on VERSION failed'
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC
+	econf --with-installed-iso-entities
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	# Else fails with sandbox violations
+	export VARTEXFONTS="${T}/fonts"
+
+	# Besides the path being wrong, in changing perl5libdir, it cannot find the
+	# catalog.
+	export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+
+	eval `perl -V:installvendorarch`
+	emake \
+		DESTDIR="${D}" \
+		perl5libdir="${installvendorarch}" \
+		LINUXDOCDOC="/usr/share/doc/${PF}/guide" \
+		install
+
+	insinto /usr/share/texmf/tex/latex/misc
+	doins tex/*.sty
+
+	dodoc ChangeLog README
+}
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
new file mode 100644
index 000000000000..a1ff68285e07
--- /dev/null
+++ b/app-text/linuxdoc-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><email>maintainer-needed@gentoo.org</email></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 other packages such as
+    SGMLTools-Lite and OpenJade.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
new file mode 100644
index 000000000000..55aacfd72f83
--- /dev/null
+++ b/app-text/llpp/Manifest
@@ -0,0 +1,8 @@
+DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
+DIST llpp-15.tar.gz 109546 SHA256 cc415775a62144f8e4185f5d550952b6d2d573072b5b7d91bc8c09c564ce156c SHA512 96f4720f2ee0d9d2d5903ed452e7314e08d14a5806b13d439e01bfd4121fe714f5146e0cb6b33bced3c9c4b652ed8c9334070643e66276f07ea9e9b50d8b5b93 WHIRLPOOL 097871bcb121807eb1d5211254e8670c0cc08eb79787d9255217d10841a0e2436ee50194f038023efa052a4db4e5ac251dd88215ef44ae966689ff03cf79252a
+DIST llpp-17_p20140112.tar.gz 118951 SHA256 7d1ae89762054d9cb4fc06af11f766ab1c638ed230213dbcf36837b9379cc612 SHA512 38249f67a7151622833cba7e19de218f43110724ca9a304f4b80ac95661c71d01a1024fac30cf66c5013669545fb08bf320225d9463d2c31844446dc3c99de0c WHIRLPOOL c67b3e60bce82dc142624d3183144230d5a42921a203f19337f0a14942aec6fb395c57edf123b1d8127ce92c90df142b3caa11b4c14ec986aa2ad6d2fae6a383
+DIST llpp-18.tar.gz 119085 SHA256 fd87f99198c26071e898e65f9d7ee2b698a8a39768a44d740733ba935fb9fe4f SHA512 994d48fe690514078a708b9a52d94f96506693863ec0c277014fc2ab5b3aa831254a3b6e227524eb46d094bb06cfe3c51ec0f2dfe50cf83d6e97198e43e9cd1c WHIRLPOOL 51862737ca0144d09db19a46a456b808a9db9d2a78a637118dc4277170f43a287e1396d0634b9d90565de120bdf86a6b625c41e27b78f7fd534ca8504e380011
+DIST llpp-19.tar.gz 122875 SHA256 a050d78ac9e3ea7b3ae285e5c860a2e52b35c3533b3c705787350ad80992c64c SHA512 997f067fc8836869657db709255e7973b4b0510a1bf7e5daef4ede524d9f60921bbc3d19cf650b7554c88781da29898d2e014b3f0c4ed4f50a97277c2d828956 WHIRLPOOL 683df1615b31a416725f38763659c0dba7755bd64aab459842bfc48fe98130b834e0e219565e0ae699595100e0e577b94204721b7e33960c99fe6c4a6e1db672
+DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
+DIST llpp-21.tar.gz 130945 SHA256 bb846ce57269848e830d2665400df107bc23146f4004a755e16fb70d90c3a971 SHA512 8194b9806fecf3f1387aa15f6bbff65ae72df545e8e79fa9244a0c6ea58bf0b96632db11a3abec8afe315acd88c41bd11f17c3b12cf76384b398fd4401f7a909 WHIRLPOOL c24c28df50669f5d684b58d0c90b497430e644b6ef61a9642a1da80324511657fbc01356b36a10754f658ead676105e4e46f94207bd422a462d7a56cc5eb37ef
+DIST llpp-21_p20150427.tar.gz 132728 SHA256 c8f1eb8eb0f8fb2e92140be7c177be9418b7cf9641f2649e7aee82101e0f0997 SHA512 8eb3c5d21cc1ae5a1d7b6d1d28cd3f8147fba62c98456d25039c90814665afdf417bb2d3ef5eb738c2561a62454f9ce8c663444d889510609cab93deaea77e81 WHIRLPOOL 1ffe07c520393fb36801f9047aa53db8ff1c48c48885e4f1972f485470781d17673b96217ef16d4e08967f5edabe15fb20ffc1e47678ddd17ed31e53251a33eb
diff --git a/app-text/llpp/files/llpp-11-WM_CLASS.patch b/app-text/llpp/files/llpp-11-WM_CLASS.patch
new file mode 100644
index 000000000000..1e767ad918fe
--- /dev/null
+++ b/app-text/llpp/files/llpp-11-WM_CLASS.patch
@@ -0,0 +1,42 @@
+--- llpp/link.c
++++ llpp/link.c
+@@ -2792,6 +2792,32 @@
+     CAMLreturn (Val_unit);
+ }
+ 
++#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;
++    int screen;
++    XClassHint hint;
++
++    dpy = XOpenDisplay (getenv ("DISPLAY"));
++    screen = 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 value ml_init (value pipe_v, value params_v)
+ {
+     CAMLparam2 (pipe_v, params_v);
+@@ -2852,5 +2878,6 @@
+         errx (1, "pthread_create: %s", strerror (ret));
+     }
+ 
++    set_wm_class ();
+     CAMLreturn (Val_unit);
+ }
diff --git a/app-text/llpp/files/llpp-20-WM_CLASS.patch b/app-text/llpp/files/llpp-20-WM_CLASS.patch
new file mode 100644
index 000000000000..7c12ff5ae9b3
--- /dev/null
+++ b/app-text/llpp/files/llpp-20-WM_CLASS.patch
@@ -0,0 +1,42 @@
+--- llpp-20/link.c
++++ llpp-20/link.c
+@@ -4305,6 +4305,32 @@
+ }
+ #endif
+ 
++#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;
++    int screen;
++    XClassHint hint;
++
++    dpy = XOpenDisplay (getenv ("DISPLAY"));
++    screen = 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 value ml_init (value csock_v, value params_v)
+ {
+     CAMLparam2 (csock_v, params_v);
+@@ -4425,5 +4451,6 @@
+         errx (1, "pthread_create: %s", strerror (ret));
+     }
+ 
++    set_wm_class ();
+     CAMLreturn (Val_unit);
+ }
diff --git a/app-text/llpp/llpp-13_p20121123.ebuild b/app-text/llpp/llpp-13_p20121123.ebuild
new file mode 100644
index 000000000000..f3f6a3051bdb
--- /dev/null
+++ b/app-text/llpp/llpp-13_p20121123.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype
+	media-libs/jbig2dec
+	media-libs/openjpeg:0
+	virtual/jpeg
+	x11-libs/libX11
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	=app-text/mupdf-1.1_p20121127
+	dev-lang/ocaml[ocamlopt]
+	dev-ml/lablgl[glut]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
+}
+
+src_compile() {
+	ocaml str.cma keystoml.ml < KEYS > help.ml || die
+	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
+
+	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
+	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
+	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
+	ocamlopt.opt -c -o help.cmx help.ml || die
+	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
+	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
+	ocamlopt.opt -c -o parser.cmx parser.ml || die
+	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
+	ocamlopt.opt -o llpp -I +lablGL \
+		str.cmxa unix.cmxa lablgl.cmxa link.o \
+	    -cclib "${mycclib}" help.cmx parser.cmx wsi.cmx main.cmx || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-15.ebuild b/app-text/llpp/llpp-15.ebuild
new file mode 100644
index 000000000000..dda82e2eb08c
--- /dev/null
+++ b/app-text/llpp/llpp-15.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]
+	media-libs/openjpeg: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[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-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"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -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) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > 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 help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-17_p20140112.ebuild b/app-text/llpp/llpp-17_p20140112.ebuild
new file mode 100644
index 000000000000..3b0bea7d5a85
--- /dev/null
+++ b/app-text/llpp/llpp-17_p20140112.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+#SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/db515851a5cf04ecb4c06311c79ce9685324bc81.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND="~app-text/mupdf-1.3_p20140118:=[static-libs]
+	media-libs/openjpeg:2[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[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-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"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -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) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > 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 help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-18.ebuild b/app-text/llpp/llpp-18.ebuild
new file mode 100644
index 000000000000..4bfb26a9760c
--- /dev/null
+++ b/app-text/llpp/llpp-18.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/w/llpp.git/snapshot/23585c732e608b486dffd2c210dc2cab43b1d4cb.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">app-text/mupdf-1.3_p20140118:0=[static-libs]
+	media-libs/openjpeg:2[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[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-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"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -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) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > 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 help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-19.ebuild b/app-text/llpp/llpp-19.ebuild
new file mode 100644
index 000000000000..e3dcb62ac86a
--- /dev/null
+++ b/app-text/llpp/llpp-19.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/w/llpp.git/snapshot/7311f1b13aaf010525c477934fe1ea49ae733625.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.5: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[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-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"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		ewarn ${spath}
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 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 fontconfig) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > 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 help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		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}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
new file mode 100644
index 000000000000..6b8c6b9360fe
--- /dev/null
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~x86"
+IUSE="+ocamlopt static"
+#IUSE="egl +ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.5: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]"
+# egl? ( media-libs/mesa[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[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20-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"
+	#if use egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi
+	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') )
+		ewarn ${spath}
+		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 ocaml str.cma keystoml.ml < KEYS > 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 bo.${cmo} le/bo.ml
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
+	verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-21.ebuild b/app-text/llpp/llpp-21.ebuild
new file mode 100644
index 000000000000..21cdfd7d7d63
--- /dev/null
+++ b/app-text/llpp/llpp-21.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/w/llpp.git/snapshot/973e613ec9062e5c41323fc58fa3435fc6c45551.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+#IUSE="egl +ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
+	<app-text/mupdf-1.7: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]"
+# egl? ( media-libs/mesa[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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20-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"
+	#if use egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi
+	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 ocaml str.cma keystoml.ml < KEYS > 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 bo.${cmo} le/bo.ml
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
+	verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-21_p20150427.ebuild b/app-text/llpp/llpp-21_p20150427.ebuild
new file mode 100644
index 000000000000..a061c0ac3544
--- /dev/null
+++ b/app-text/llpp/llpp-21_p20150427.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/w/llpp.git/snapshot/66868744188151eaa433d42c807e1efc5f623aa4.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+#IUSE="egl +ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.7a: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]"
+# egl? ( media-libs/mesa[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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20-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"
+	#if use egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi
+	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 ocaml str.cma keystoml.ml < KEYS > 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 bo.${cmo} le/bo.ml
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
+	verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
new file mode 100644
index 000000000000..6ae222aa5ce2
--- /dev/null
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-2 multilib toolchain-funcs
+
+DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+EGIT_REPO_URI="git://repo.or.cz/llpp.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.7a: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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20-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"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 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 fontconfig) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > 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 bo.${cmo} le/bo.ml
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
+	verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/app-text/llpp/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>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/app-text/lodgeit/Manifest b/app-text/lodgeit/Manifest
new file mode 100644
index 000000000000..cf7c54ae8285
--- /dev/null
+++ b/app-text/lodgeit/Manifest
@@ -0,0 +1,4 @@
+DIST lodgeit-0.3_p20120507.py 12785 SHA256 87dfd329e7d1fdf1902c6d1903a0b629b63749b69932235ed4d70c2e836400ab SHA512 a6300a4d11626cde612f1b88f137587241940f2ef3b08ea2745e85cd2423161fd882adc04ce64aa9adbffd883cb2fe30793791a0f36a2e8d69cb757075ef6873 WHIRLPOOL add0cb101cd47ab4165c593fab6ab51d6303f307481b29ee3c2212a9a93b78ac35bd93aa0cb5e4ee1458986d464f22021eb521ec1eaa69edae68851f8ceb5369
+DIST lodgeit-0.3_p20120507.vim 3882 SHA256 b8c1e918a7d6e7c5675ccd05893ad7bf3dae19493248e85735fded16903b06bc SHA512 d8a627fa2430680b78de9d0412c05955fd3294b56590e0e3448d75d9b3f8f5c8921187fee6de5eaf7f9b8e93080042eb3719e2f690c601508ea08878616f301d WHIRLPOOL f6d399c76f7873978d63e2a2f0720bde672d495e45f1fbec02c4125e6e5ae1a3ffa1effcda9e9b8402928c5134456a48a5f53a09f7ffb2667cf4933bbc0c9aee
+DIST lodgeit-0.3_p20120618.py 13010 SHA256 6a48885c6215d5b3abea55934cddc74a9fb3fdac03e29e269c7e7913b99f0f3b SHA512 23da205f2fc3c60c5df9816dcf08a45ff87523698675122ea231ca29ba04d178c003d2a55577f0e0e4dee08c670d5a18826e6bc6cf325b9e28c5668f1bd4d027 WHIRLPOOL 788e52c4533f153fc43c8ea8f316fc691ff48469e28541471524208ad2c54807e24c192d489fe68279586d28cd20fe8004b588cab9730fd8b9fdfc4b84a3d4b4
+DIST lodgeit-0.3_p20120618.vim 3882 SHA256 b8c1e918a7d6e7c5675ccd05893ad7bf3dae19493248e85735fded16903b06bc SHA512 d8a627fa2430680b78de9d0412c05955fd3294b56590e0e3448d75d9b3f8f5c8921187fee6de5eaf7f9b8e93080042eb3719e2f690c601508ea08878616f301d WHIRLPOOL f6d399c76f7873978d63e2a2f0720bde672d495e45f1fbec02c4125e6e5ae1a3ffa1effcda9e9b8402928c5134456a48a5f53a09f7ffb2667cf4933bbc0c9aee
diff --git a/app-text/lodgeit/files/lodgeitrc b/app-text/lodgeit/files/lodgeitrc
new file mode 100644
index 000000000000..9477df8abfc7
--- /dev/null
+++ b/app-text/lodgeit/files/lodgeitrc
@@ -0,0 +1,2 @@
+server_name = http://bpaste.net/
+encoding = utf-8
diff --git a/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild b/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild
new file mode 100644
index 000000000000..59863dfe1d91
--- /dev/null
+++ b/app-text/lodgeit/lodgeit-0.3_p20120507.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+MY_REV="03a5e8a6d1d4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit python
+
+DESCRIPTION="Command-line interface to paste.pocoo.org"
+HOMEPAGE="http://paste.pocoo.org/"
+SRC_URI="https://bitbucket.org/skrattaren/lodgeit-script-gentoo/raw/${MY_REV}/scripts/lodgeit.py
+	-> ${P}.py
+	vim? ( http://www.vim.org/scripts/download_script.php?src_id=8848
+	-> ${P}.vim )"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="vim"
+
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="
+	vim? ( || ( app-editors/vim[python] app-editors/gvim[python] ) )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	installation(){
+		newbin "${DISTDIR}/${P}.py" "${PN}-${PYTHON_ABI}"
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/${PN}-${PYTHON_ABI}
+	}
+	python_execute_function installation
+	python_generate_wrapper_scripts "${ED}"/usr/bin/${PN}
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		newins "${DISTDIR}/${P}.vim" "${PN}.vim"
+	fi
+}
diff --git a/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild b/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild
new file mode 100644
index 000000000000..d5e76f316feb
--- /dev/null
+++ b/app-text/lodgeit/lodgeit-0.3_p20120618-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+MY_REV="1ca55b8189de"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit python
+
+DESCRIPTION="Command-line interface to paste.pocoo.org"
+HOMEPAGE="http://paste.pocoo.org/"
+SRC_URI="https://bitbucket.org/skrattaren/lodgeit-script-gentoo/raw/${MY_REV}/scripts/lodgeit.py
+	-> ${P}.py
+	vim? ( http://www.vim.org/scripts/download_script.php?src_id=8848
+	-> ${P}.vim )"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vim"
+
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="
+	vim? ( || ( app-editors/vim[python] app-editors/gvim[python] ) )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	installation(){
+		newbin "${DISTDIR}/${P}.py" "${PN}-${PYTHON_ABI}"
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/${PN}-${PYTHON_ABI}
+	}
+	python_execute_function installation
+	python_generate_wrapper_scripts "${ED}"/usr/bin/${PN}
+
+	insinto /etc
+	doins "${FILESDIR}"/lodgeitrc
+
+	if use vim; then
+		local vimdir=/usr/share/vim/vimfiles/plugin
+		insinto ${vimdir}
+		newins "${DISTDIR}"/${P}.vim ${PN}.vim
+		#Change default service for Lodgeit vim script
+		sed -e 's:paste.pocoo.org:bpaste.net:g' \
+			-i "${ED}"${vimdir}/${PN}.vim || die "sed failed"
+	fi
+}
diff --git a/app-text/lodgeit/metadata.xml b/app-text/lodgeit/metadata.xml
new file mode 100644
index 000000000000..4b46940c9644
--- /dev/null
+++ b/app-text/lodgeit/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>
+    <email>qnikst@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name='vim'>
+      Install a vim plugin allowing to paste and download from within vim
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/logmerge/Manifest b/app-text/logmerge/Manifest
new file mode 100644
index 000000000000..1b1492b88b67
--- /dev/null
+++ b/app-text/logmerge/Manifest
@@ -0,0 +1 @@
+DIST logmerge-0.4-beta.zip 2270 SHA256 9e17f0a52608b83e882d65ca759520a623fad94dd09b780a32ce440ead4e4be5 SHA512 314b2ffc1f07fe32f17ac2f20861abbf8e43b635fded83ba096ee8b99858e219026b86926c5d3ed693fe1f6e1edd96fd69a2a71dedb7cb63da0aae816a945720 WHIRLPOOL eacd5c4f7d3bbb319271a04269c82d541fdfd8018ca909d2560bc83894131f631838ccc30e7e833f871c795d5184db0710dc23006d5ea0610964834866760525
diff --git a/app-text/logmerge/logmerge-0.4_beta.ebuild b/app-text/logmerge/logmerge-0.4_beta.ebuild
new file mode 100644
index 000000000000..4befdc48ef4a
--- /dev/null
+++ b/app-text/logmerge/logmerge-0.4_beta.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Merge multiple logs such that multilined entries appear in chronological order without breaks"
+HOMEPAGE="https://code.google.com/p/logmerge/"
+SRC_URI="https://${PN}.googlecode.com/files/${PN}-${MY_PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
new file mode 100644
index 000000000000..b0a9ab94866d
--- /dev/null
+++ b/app-text/logmerge/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    Merge multiple logs such that multilined entries appear in chronological order without breaks.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
new file mode 100644
index 000000000000..b45b4b9f26c7
--- /dev/null
+++ b/app-text/lout/Manifest
@@ -0,0 +1,2 @@
+DIST lout-3.38.tar.gz 2147395 SHA256 6a2adc64a8b4a81ed39893328778da284a6ab0da3e5e20f678425f2d53dad80a SHA512 ad396dc885e904e26c31498123f4e6e5dd1356da7fe623b2a812e9ae8442ee4c68ed3925854f8116687f46c9cc0084b6d39a3130d8b9d8a3ee0ee25d5b9b1f5e WHIRLPOOL 59c8d99710fbc5096f84e75be13a1e64213e0c783c0bff30594ff0d23148aab3a619f6c2064bd62f059a7593d92b34f4689266d80eeb42d559fcd468d37412d5
+DIST lout-3.39.tar.gz 2157040 SHA256 78a75504fa25c2e55539ecd9f4ba13ff1e402a1ffb307d70474a4d6033f6f389 SHA512 c4201976282f29f5cc57076ae314b6fa2e9aca3ab0512e50a3c6a67851a507a9c055a059ce7737318969836d19e8637a2bc0ed88f536892cbbeeb3b476234799 WHIRLPOOL 33011a2b193446b17cf8c56525159b4650d01259dbb5931e8635ebfb412e6379c3c2f3a6f1da2ad72d24c5a4a6130046b45154396313e042a85a9dbc03b2bc8d
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.38-r1.ebuild b/app-text/lout/lout-3.38-r1.ebuild
new file mode 100644
index 000000000000..dc5d98481395
--- /dev/null
+++ b/app-text/lout/lout-3.38-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils toolchain-funcs
+
+IUSE="zlib doc"
+
+DESCRIPTION="high-level language for document formatting"
+HOMEPAGE="http://lout.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lout/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-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/lout-3.39.ebuild b/app-text/lout/lout-3.39.ebuild
new file mode 100644
index 000000000000..105d711763ae
--- /dev/null
+++ b/app-text/lout/lout-3.39.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils toolchain-funcs
+
+IUSE="zlib doc"
+
+DESCRIPTION="high-level language for document formatting"
+HOMEPAGE="http://lout.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lout/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${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..ae08f33fba24
--- /dev/null
+++ b/app-text/lout/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..988c3f7191c5
--- /dev/null
+++ b/app-text/lv/Manifest
@@ -0,0 +1 @@
+DIST lv451.tar.gz 605082 SHA256 e1cd2e27109fbdbc6d435f2c3a99c8a6ef2898941f5d2f7bacf0c1ad70158bcf SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810 WHIRLPOOL 9dabb78926c0e7dd7f4ea1181a2e3e9bfb1f2819d4b71c1fbee05779612e77fc4e795d150aba3891f2f4b57ca0f2697353813e30b654640a0ed58c4e51cb4b8f
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-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..c3c89a1a2e22
--- /dev/null
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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/metadata.xml b/app-text/lv/metadata.xml
new file mode 100644
index 000000000000..cb36a2fd8c76
--- /dev/null
+++ b/app-text/lv/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cjk</herd>
+</pkgmetadata>
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
new file mode 100644
index 000000000000..4dd4efaf67c8
--- /dev/null
+++ b/app-text/mathtex/Manifest
@@ -0,0 +1 @@
+DIST mathtex-1.04.zip 148443 SHA256 f3bd3dc0491f37eb5de8bcd40b04cb11cd84581d2f16a6a2f61fc79622dd6adf SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601 WHIRLPOOL 4c67b17a5d761e612ec12f372244665b0c41aea9066bb970bb263477a18407f76ef43786be50f41d645019165126219c39b22e6c67b2d2c60b70dc0b535040e2
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
new file mode 100644
index 000000000000..a1ff4bb0fd33
--- /dev/null
+++ b/app-text/mathtex/mathtex-1.04.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="MathTeX 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..0722c89f1d72
--- /dev/null
+++ b/app-text/mathtex/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>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<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/mbtpdfasm/Manifest b/app-text/mbtpdfasm/Manifest
new file mode 100644
index 000000000000..bbb0a8b69801
--- /dev/null
+++ b/app-text/mbtpdfasm/Manifest
@@ -0,0 +1,2 @@
+DIST mbtPdfAsm-1.0.28.tar.gz 253032 SHA256 e416aab7d805308f82f3cbe91f964eab6be5da8a232bd52e13a048740194048f SHA512 78cd744e1ffbf7db1b3fb27d8edf369382ff0e9c48634b85f13734561dceef1a22bae7e001ad01567e924d41465bb03f16480f3e588b060bcd5e2c50b14dc016 WHIRLPOOL ae1db87ddc46ec4814ffe5d5442d0171537e7b9af69ba41bee81c2926edc097fd2e30b4247cd1098e6170946571d11e60e5e20ce49a891f15212eeecafed8ecc
+DIST mbtpdfasm-1.0.28-manual.pdf.bz2 6581 SHA256 648a21a665098815dc0ae9ec1b2faa8f24a0e99ab64af1dbadf54515959cff89 SHA512 cc9660427cfe33c3b070b31676d94d8ac64940a5625c7441cb1401d09e828be077fa7d67d0496fa71ef1c50a077c8882a89f63f76f8531cae00aff5edf6e1fa2 WHIRLPOOL f70a5cc91ecc4f27c2e38a7316debf0be7134cacd5e17ad00334394aed246d8111409a8fcf6179350be4e9e73778345cd67b3125348f7a6ebe332c64daf45104
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
new file mode 100644
index 000000000000..bd63327f29a5
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
@@ -0,0 +1,37 @@
+--- pdfFile.hpp.orig	2007-07-26 16:32:50.000000000 +0200
++++ pdfFile.hpp	2007-10-05 22:40:50.000000000 +0200
+@@ -161,7 +161,7 @@
+ 

+       //int findInheritRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);

+       int makeRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);

+-      int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, char *add, int lgAdd);

++      int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, int add, int lgAdd);

+ 

+       bool fast; // version rapide, on ne g�re pas les options

+       bool closed; //protection plus rien n'est possible apr�s l'appel � la fonction close

+--- pdfFile.cpp.orig	2007-08-22 20:44:31.000000000 +0200
++++ pdfFile.cpp	2007-10-05 22:42:39.000000000 +0200
+@@ -934,7 +934,7 @@
+ /* ********************************************** */
+ #pragma warning(disable : 4100)
+ 
+-int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, char *add, int lgAdd) {
++int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, int add, int lgAdd) {
+ char *pc;
+ int lgRes, lgBuf, j, nObj, r;
+ 
+@@ -973,12 +973,12 @@
+    }
+ 
+    if ( (lgAdd != 0) && (add != 0) ) {
+-      switch ( (int)add ) {
++      switch ( add ) {
+       case _Resources:
+ 
+          break;
+       default:
+-         memcpy(pc + lgRes, add + sizeof(int), lgAdd);
++         memcpy(pc + lgRes, (char *)add + sizeof(int), lgAdd);
+          lgRes += lgAdd;
+       }
+    }
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
new file mode 100644
index 000000000000..99b109d59332
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
@@ -0,0 +1,11 @@
+--- main.cpp.orig	2007-07-30 15:25:27.000000000 +0200
++++ main.cpp	2007-10-05 22:49:29.000000000 +0200
+@@ -52,7 +52,7 @@
+ char tc[1000];

+ int i;

+ 

+-   fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s", strVersion, strMPAURL);

++   fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s\n", strVersion, strMPAURL);

+ 

+    return 0;

+ }

diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
new file mode 100644
index 000000000000..278a3c03779b
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
@@ -0,0 +1,101 @@
+--- makefile.orig	2007-07-26 19:33:54.000000000 +0200
++++ makefile	2007-10-05 22:54:31.000000000 +0200
+@@ -10,66 +10,66 @@
+ ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
+ #
+ $(EXENAME): $(LF) $(ZLIB)
+-	$(CC) $(LF) $(ZLIB) -o $@
++	$(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
+ $(O)/main.o: main.cpp
+-	$(CC) -c main.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c main.cpp -o $*.o
+ $(O)/pdfFile.o: pdfFile.cpp
+-	$(CC) -c pdfFile.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfFile.cpp -o $*.o
+ $(O)/pdfObject.o: pdfObject.cpp
+-	$(CC) -c pdfObject.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfObject.cpp -o $*.o
+ $(O)/pdfEncrypt.o: pdfEncrypt.cpp
+-	$(CC) -c pdfEncrypt.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfEncrypt.cpp -o $*.o
+ $(O)/pdfNames.o: pdfNames.cpp
+-	$(CC) -c pdfNames.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfNames.cpp -o $*.o
+ $(O)/pdfFileOutline.o: pdfFileOutline.cpp
+-	$(CC) -c pdfFileOutline.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfFileOutline.cpp -o $*.o
+ $(O)/pdfXrefTable.o: pdfXrefTable.cpp
+-	$(CC) -c pdfXrefTable.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfXrefTable.cpp -o $*.o
+ $(O)/string.o: string.cpp
+-	$(CC) -c string.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c string.cpp -o $*.o
+ $(O)/pdfString.o: pdfString.cpp
+-	$(CC) -c pdfString.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfString.cpp -o $*.o
+ $(O)/rc4.o: rc4.cpp
+-	$(CC) -c rc4.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c rc4.cpp -o $*.o
+ $(O)/md5.o: md5.c
+-	$(CC) -c md5.c -o $*.o
++	$(CC) $(CXXFLAGS) -c md5.c -o $*.o
+ $(O)/listeFichiers_linux.o: listeFichiers_linux.cpp
+-	$(CC) -c listeFichiers_linux.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c listeFichiers_linux.cpp -o $*.o
+ $(O)/diversPdf.o: diversPdf.cpp
+-	$(CC) -c diversPdf.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c diversPdf.cpp -o $*.o
+ $(O)/strMatcher.o: strMatcher.cpp
+-	$(CC)  -c strMatcher.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c strMatcher.cpp -o $*.o
+ $(O)/pcre.o: pcre.c
+-	$(CC) -c pcre.c -o $*.o
++	$(CC) $(CXXFLAGS) -c pcre.c -o $*.o
+ $(O)/study.o: study.c
+-	$(CC) -c study.c -o $*.o
++	$(CC) $(CXXFLAGS) -c study.c -o $*.o
+ $(O)/get.o: get.c
+-	$(CC) -c get.c -o $*.o
++	$(CC) $(CXXFLAGS) -c get.c -o $*.o
+ $(O)/maketables.o: maketables.c
+-	$(CC) -c maketables.c -o $*.o
++	$(CC) $(CXXFLAGS) -c maketables.c -o $*.o
+ $(O)/calc.o: calc.cpp
+-	$(CC) -c calc.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c calc.cpp -o $*.o
+ $(O)/adler32.o: adler32.c zlib.h zconf.h
+-	$(CC) -c adler32.c -o $*.o
++	$(CC) $(CXXFLAGS) -c adler32.c -o $*.o
+ $(O)/compress.o: compress.c zlib.h zconf.h
+-	$(CC) -c compress.c -o $*.o
++	$(CC) $(CXXFLAGS) -c compress.c -o $*.o
+ $(O)/crc32.o: crc32.c zlib.h zconf.h crc32.h
+-	$(CC) -c crc32.c -o $*.o
++	$(CC) $(CXXFLAGS) -c crc32.c -o $*.o
+ $(O)/deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
+-	$(CC) -c deflate.c -o $*.o
++	$(CC) $(CXXFLAGS) -c deflate.c -o $*.o
+ $(O)/gzio.o: gzio.c zutil.h zlib.h zconf.h
+-	$(CC) -c gzio.c -o $*.o
++	$(CC) $(CXXFLAGS) -c gzio.c -o $*.o
+ $(O)/infback.o: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+-	$(CC) -c infback.c -o $*.o
++	$(CC) $(CXXFLAGS) -c infback.c -o $*.o
+ $(O)/inffast.o: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+-	$(CC) -c inffast.c -o $*.o
++	$(CC) $(CXXFLAGS) -c inffast.c -o $*.o
+ $(O)/inflate.o: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+-	$(CC) -c inflate.c -o $*.o
++	$(CC) $(CXXFLAGS) -c inflate.c -o $*.o
+ $(O)/inftrees.o: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+-	$(CC) -c inftrees.c -o $*.o
++	$(CC) $(CXXFLAGS) -c inftrees.c -o $*.o
+ $(O)/trees.o: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+-	$(CC) -c trees.c -o $*.o
++	$(CC) $(CXXFLAGS) -c trees.c -o $*.o
+ $(O)/uncompr.o: uncompr.c zlib.h zconf.h
+-	$(CC) -c uncompr.c -o $*.o
++	$(CC) $(CXXFLAGS) -c uncompr.c -o $*.o
+ $(O)/zutil.o: zutil.c zutil.h zlib.h zconf.h
+-	$(CC) -c zutil.c -o $*.o
++	$(CC) $(CXXFLAGS) -c zutil.c -o $*.o
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
new file mode 100644
index 000000000000..02446ae6ea7a
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
@@ -0,0 +1,26 @@
+diff -Naur work.orig/makefile work/makefile
+--- work.orig/makefile	2010-07-21 01:11:54.390456452 +0200
++++ work/makefile	2010-07-21 01:12:22.843456093 +0200
+@@ -9,8 +9,8 @@
+ LF = $(O)/main.o $(O)/pdfFile.o $(O)/pdfXrefTable.o $(O)/string.o $(O)/rc4.o $(O)/md5.o $(O)/pdfString.o $(O)/listeFichiers_linux.o $(O)/diversPdf.o $(O)/strMatcher.o $(O)/pcre.o $(O)/study.o $(O)/get.o $(O)/maketables.o $(O)/pdfEncrypt.o $(O)/pdfFileOutline.o $(O)/pdfNames.o $(O)/pdfObject.o $(O)/calc.o
+ ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
+ #
+-$(EXENAME): $(LF) $(ZLIB)
+-	$(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
++$(EXENAME): $(LF)
++	$(CC) $(LDFLAGS) $(LF) -lz -o $@
+ $(O)/main.o: main.cpp
+ 	$(CC) $(CXXFLAGS) -c main.cpp -o $*.o
+ $(O)/pdfFile.o: pdfFile.cpp
+diff -Naur work.orig/pdfObject.cpp work/pdfObject.cpp
+--- work.orig/pdfObject.cpp	2007-08-22 20:13:56.000000000 +0200
++++ work/pdfObject.cpp	2010-07-21 01:11:54.486455713 +0200
+@@ -1,7 +1,7 @@
+ #include "pdfObject.hpp"

+ #include "pdfXrefTable.hpp"

+ #include "diversPdf.hpp"

+-#include "zlib.h"

++#include <zlib.h>

+ #include <stdlib.h>

+ 

+ #ifdef DEBUG_MEM_LEAK

diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
new file mode 100644
index 000000000000..54cc2c3e387d
--- /dev/null
+++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P="mbtPdfAsm-${PV}"
+
+DESCRIPTION="Tool to assemble/merge PDF files, extract information from, and update the metadata in PDF files"
+HOMEPAGE="http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html"
+SRC_URI="http://thierry.schmit.free.fr/spip/IMG/gz/${MY_P}.tar.gz
+	http://sbriesen.de/gentoo/distfiles/${P}-manual.pdf.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile.diff"
+	epatch "${FILESDIR}/${P}-64bit.diff"
+	epatch "${FILESDIR}/${P}-main.diff"
+
+	# use system zlib
+	epatch "${FILESDIR}/${P}-zlib.diff"
+	mv -f "zlib.h" "zlib.h.disabled"
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	dobin mbtPdfAsm || die "install failed"
+	insinto "/usr/share/doc/${PF}"
+	newins ${P}-manual.pdf mbtPdfAsm.pdf
+}
diff --git a/app-text/mbtpdfasm/metadata.xml b/app-text/mbtpdfasm/metadata.xml
new file mode 100644
index 000000000000..931973019459
--- /dev/null
+++ b/app-text/mbtpdfasm/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		This program can be used to assemble/merge PDF files, extract
+		information from PDF files, and update the metadata in PDF files.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
new file mode 100644
index 000000000000..83dbfd2de109
--- /dev/null
+++ b/app-text/mecab/Manifest
@@ -0,0 +1 @@
+DIST mecab-0.996.tar.gz 1398663 SHA256 e073325783135b72e666145c781bb48fada583d5224fb2490fb6c1403ba69c59 SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f WHIRLPOOL a21bcc48f61c98a20c299ccbe7ae1c1c39c5502903107906be7c5dfb6fafb60d0768a665cd3005339cd5fa4ff476bfdba53abbdbf114a7e8ccce9835de9b11cb
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..aa2307e527b5
--- /dev/null
+++ b/app-text/mecab/mecab-0.996.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
+HOMEPAGE="http://mecab.sourceforge.net/"
+SRC_URI="http://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..1ec95998be06
--- /dev/null
+++ b/app-text/mecab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="google-code">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..8baebf43d2c6
--- /dev/null
+++ b/app-text/mftrace/Manifest
@@ -0,0 +1 @@
+DIST mftrace-1.2.18.tar.gz 79112 SHA256 0d31065f1d35919e311d9170bbfcdacc58736e3f783311411ed1277aa09d3261 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db WHIRLPOOL 32db904ab2962046052416ecab143b3bcc3480ac4baa99d1c68dfb0da8907722f69ab3de68d8e62fb9959094e0b08b764a1e2aca3945737238877f4b0372526d
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
new file mode 100644
index 000000000000..f967eaf5ae9c
--- /dev/null
+++ b/app-text/mftrace/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>fonts</herd>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/mftrace/mftrace-1.2.18.ebuild b/app-text/mftrace/mftrace-1.2.18.ebuild
new file mode 100644
index 000000000000..d41aa2d5f531
--- /dev/null
+++ b/app-text/mftrace/mftrace-1.2.18.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python toolchain-funcs
+
+DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
+HOMEPAGE="http://lilypond.org/mftrace/"
+SRC_URI="http://lilypond.org/download/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"
+
+RDEPEND=">=app-text/t1utils-1.25
+	|| ( media-gfx/potrace >=media-gfx/autotrace-0.30 )
+	truetype? ( media-gfx/fontforge )
+	virtual/latex-base"
+DEPEND="${RDEPEND}
+	test? ( media-gfx/fontforge )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		--datadir="$(python_get_sitedir)" \
+		PYTHON="$(PYTHON)"
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS}"
+}
+
+src_install () {
+	emake DESTDIR="${D}" PYC_MODULES="" install
+	dodoc README.txt ChangeLog
+}
+
+pkg_postinst() {
+	python_mod_optimize mftrace
+}
+
+pkg_postrm() {
+	python_mod_cleanup mftrace
+}
diff --git a/app-text/mht-rip/Manifest b/app-text/mht-rip/Manifest
new file mode 100644
index 000000000000..7dadd0228bc8
--- /dev/null
+++ b/app-text/mht-rip/Manifest
@@ -0,0 +1 @@
+DIST mht-rip-0.8.c 9105 SHA256 f30669b1dd036e59ef9af70bbf257e6beb3b736c1b31672bef52dea18f0410de SHA512 377643c75e621dfa88f426db8e0f8e0959aaa841d1950ab1cc4d514de1a4120cbd20e9f18aa58607b6012a9417095489de968002bd8d91fd89f71dcc0b90357e WHIRLPOOL 35f82466220e36f3d2e37932038e46be8165a93fefbcbb383ec5e9dbd4f7d48d4360a65bbb9b5bc703ecc8db1759d3847472a5783198c8653ae4986554a4c6da
diff --git a/app-text/mht-rip/metadata.xml b/app-text/mht-rip/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/app-text/mht-rip/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</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..669682131da8
--- /dev/null
+++ b/app-text/mht-rip/mht-rip-0.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..fd4f30a93ba3
--- /dev/null
+++ b/app-text/mpage/Manifest
@@ -0,0 +1 @@
+DIST mpage-2.5.6.tgz 86748 SHA256 4fe66dfc27f7c4bfbca60ef617f968aa2e6ee877e8921aa968c16a03aa4edc04 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d WHIRLPOOL 9d7abfd66ba0faf53a18f9dc59d1566d22364f9a7b0593a149cae1d2e781f4c104dfcd984da63081b9276811f9832829d8feab1ad41040070ca8c7378e96f7cf
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..91f4e72fb544
--- /dev/null
+++ b/app-text/mpage/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</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..803921ee4330
--- /dev/null
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..6652c69d710c
--- /dev/null
+++ b/app-text/multitail/Manifest
@@ -0,0 +1,3 @@
+DIST multitail-6.2.1.tgz 166049 SHA256 1e586cd62c3cdb8089062c9670a6d8588359e2f8030b8b18dbc715ea59d92e11 SHA512 e1515c000c25be6532f590a2d030c44419866994c2744140d124c1b6ac73acf460b3a41ba6e0e8398350c180030eb69d13b537005b0744047d5c5a374b4cb123 WHIRLPOOL a14ec63145f412b21d7c769452c957fda1170daae725113991a8f4c1da19430516b7a27582f183b312a3388a6944beac0de64753684d60cc7255453254c2fd1c
+DIST multitail-6.3.tgz 155410 SHA256 1ba6afc2d0322bc09024664762a2fc7b8055c1d8ceb74acc442c49ccc84b817a SHA512 e16bb8f1db97e24ac917193cfcae77a0933c1d91cbebb8ba3d2f0af3cb9fe3b801b08f5a7b70b6f46c5edb4a251c81d5a8e03ec9599d40857a64f3cfa1f6734f WHIRLPOOL a37443f3ceaaedc1e708503c9cf9df01034a03dcc682406c0d93beb2a5f1c391f1ab0df7762d94fa43af8d155932bf23cd198e8a01b45fd3c5ee5963c62da24f
+DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543
diff --git a/app-text/multitail/files/multitail-6.0-as-needed.patch b/app-text/multitail/files/multitail-6.0-as-needed.patch
new file mode 100644
index 000000000000..c78bd794f699
--- /dev/null
+++ b/app-text/multitail/files/multitail-6.0-as-needed.patch
@@ -0,0 +1,36 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,14 +4,15 @@ UTF8_SUPPORT=yes
+ DESTDIR=/
+ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+ 
+-CC=gcc
++CC?=gcc
++PKG_CONFIG?=pkg-config
+ DEBUG=-g -D_FORTIFY_SOURCE=2 # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
+ ifeq ($(UTF8_SUPPORT),yes)
+-LDFLAGS+=-lpanelw -lncursesw -lutil -lm $(DEBUG) -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
++LIBS+=`$(PKG_CONFIG) --libs ncursesw panelw` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
+ else
+-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
+-CFLAGS+=-funsigned-char -D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
++LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -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
+@@ -19,10 +20,10 @@ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -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) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	cp multitail $(DESTDIR)/usr/bin
diff --git a/app-text/multitail/files/multitail-6.3-as-needed.patch b/app-text/multitail/files/multitail-6.3-as-needed.patch
new file mode 100644
index 000000000000..27b2cfaf1659
--- /dev/null
+++ b/app-text/multitail/files/multitail-6.3-as-needed.patch
@@ -0,0 +1,31 @@
+--- a/Makefile
++++ b/Makefile
+@@ -8,11 +8,11 @@ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
+ CC?=gcc
+ DEBUG=-g -O2 -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
++LIBS+=`$(PKG_CONFIG) --libs ncursesw panelw` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -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
++LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -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 @@ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS)
+ 
+ multitail_ccmalloc: $(OBJS)
+-	ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS)
+ 
+ install: multitail
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
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..68d82602a73d
--- /dev/null
+++ b/app-text/multitail/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <maintainer>
+    <email>wschlich@gentoo.org</email>
+    <name>Wolfram Schlich</name>
+    <description>Primary maintainer</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/multitail/multitail-6.2.1.ebuild b/app-text/multitail/multitail-6.2.1.ebuild
new file mode 100644
index 000000000000..ccaa4841a5c9
--- /dev/null
+++ b/app-text/multitail/multitail-6.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="sys-libs/ncurses[unicode?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0-as-needed.patch
+
+	sed \
+		-e '/gcc/d' \
+		-e '/scan-build/d' \
+		-e 's:make clean::g' \
+		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-i Makefile || 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
+
+	dodoc Changes readme.txt thanks.txt
+	doman multitail.1
+
+	dohtml manual.html
+
+	docinto examples
+	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
+}
diff --git a/app-text/multitail/multitail-6.3.ebuild b/app-text/multitail/multitail-6.3.ebuild
new file mode 100644
index 000000000000..067f08d8eb2a
--- /dev/null
+++ b/app-text/multitail/multitail-6.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="
+	sys-libs/ncurses[unicode?]
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	sed \
+		-e '/gcc/d' \
+		-e '/scan-build/d' \
+		-e 's:make clean::g' \
+		-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
+
+	use examples && \
+		docinto examples && \
+		dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
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..89a0195d90ab
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="
+	sys-libs/ncurses[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..9fd4b839afa1
--- /dev/null
+++ b/app-text/mupdf/Manifest
@@ -0,0 +1,8 @@
+DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
+DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
+DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
+DIST mupdf-1.4.tar.gz 7470075 SHA256 ccac5ad1129f051dbaecbeec01b85f548c8bdb1c97b5e1dd397299bf7f988438 SHA512 6de95fa02e3ebaf2f268765df7eb4c1b53ef0b3b39b57b8e64097c429727dd483894e3a62c520151197290a8e392b9b1746109fc3eb528b44245040acc82a25e WHIRLPOOL a43ab9bbaf5cd5e40445ace3fdeb9e0b57e4924c7e9a7669899275da2c8a41725d862fb1cd85d779852ec794be8184b7d21aaee932024d7d0557e076de6611a4
+DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
+DIST mupdf-1.6.tar.gz 8188199 SHA256 ac6f64d5c287b6549d3c26af8fa298c91697f10ebe52b122ba2c1f43e5ccfa52 SHA512 cda47ef4442bb7de15fc54b87e0e819f80c56c144318b9e953bc36c3da0bb331a10f44016bc89986c317828b7043e737a89556fc51158114b1da58cd8f7977c7 WHIRLPOOL ea14db6f43a70df144f3f70c3421ac7d2096d835fa222f0d5b9c6d64214f5c9156884b6660dda7e1fd2bee83fa9ce66ca25b2f6290ba1588fc55035ad6228413
+DIST mupdf-1.7.tar.gz 7342238 SHA256 9c79ef0ad3343f8feed8aabfaaad6ba7cbdb3e3398aa380ed505ed71086d0fbc SHA512 f4c438019285731e5c8bb6f1f9c46ae20b9fd5f720034ab40d4e31ed4b2dd9cd704c45f1b25f68d46c1ed0a9c76d16b01fb26b83aa372497f924a763f9676044 WHIRLPOOL 3674a0144fa44c618380f06cba5093016fa6f0aa37ef6cc32e582e4f0a94cedb2e320db0f42007d6096650d42cbc2cc28716adf3371f214728c01332d4120462
+DIST mupdf-1.7a.tar.gz 7345618 SHA256 1e67196e18e900f8af1799133236afbffe2d8e412052a711eb9f6f9c9d603534 SHA512 07260bd7d3fa55531bc2a7c1c71990d032725f32675d88c94c978349736c2ba3367934ea0e4f86b52546ce898f36596d14d32ab876dc87eb5290560a28d4b8b9 WHIRLPOOL c307b8169a7e112aade7700acf7abad1528aa048375310ed17112e8ef8dde5f175d9ad1f07bae371d263f573739f92e0cc12659b8a691a3b4992447cebb9f14a
diff --git a/app-text/mupdf/files/mupdf-1.0-zoom.patch b/app-text/mupdf/files/mupdf-1.0-zoom.patch
new file mode 100644
index 000000000000..8f976b9d5142
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.0-zoom.patch
@@ -0,0 +1,18 @@
+--- mupdf-9999/apps/pdfapp.c
++++ mupdf-9999/apps/pdfapp.c
+@@ -858,6 +858,7 @@
+ 		break;
+ 
+ 	case 'b':
++	case '\b': //backspace
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -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.1_p20121127-buildsystem.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
new file mode 100644
index 000000000000..d15187486105
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
@@ -0,0 +1,24 @@
+--- mupdf-1.0-source/Makerules
++++ mupdf-1.0-source/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
+@@ -21,9 +21,9 @@
+ endif
+ 
+ ifeq "$(OS)" "Linux"
+-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg`
+-X11_LIBS := -lX11 -lXext
++SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
++SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg)
++X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
new file mode 100644
index 000000000000..e666197cac4b
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
@@ -0,0 +1,20 @@
+--- mupdf-1.1/debian/mupdf.desktop
++++ mupdf-1.1/debian/mupdf.desktop
+@@ -1,8 +1,6 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=MuPDF
+ GenericName=PDF file viewer
+-Comment=PDF file viewer
+ Exec=mupdf %f
+ TryExec=mupdf
+ Icon=mupdf
+@@ -10,6 +8,8 @@
+ Type=Application
+ MimeType=application/pdf;application/x-pdf;
+ Categories=Viewer;Graphics;
++Actions=View;
+ 
+ [Desktop Action View]
++Name=View with mupdf
+ Exec=mupdf %f
diff --git a/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch b/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
new file mode 100644
index 000000000000..fc7572ebe7d4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
@@ -0,0 +1,22 @@
+--- mupdf-1.0-source/Makerules
++++ mupdf-1.0-source/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
+@@ -21,8 +21,8 @@
+ endif
+ 
+ ifeq "$(OS)" "Linux"
+-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11_LIBS := -lX11 -lXext
++SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
++X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch b/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
new file mode 100644
index 000000000000..c62122e01eb4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
@@ -0,0 +1,10 @@
+--- mupdf-9999/apps/pdfapp.c
++++ mupdf-9999/apps/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.2-mubusy_rename_fix.patch b/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
new file mode 100644
index 000000000000..7ac486b94ee5
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
@@ -0,0 +1,13 @@
+should be upstream, but not included here http://bugs.ghostscript.com/show_bug.cgi?id=693595#c1
+
+--- mupdf-1.2-source/Makefile
++++ mupdf-1.2-source/Makefile
+@@ -212,7 +212,7 @@
+ 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
+ 	install $(FITZ_LIB) $(DESTDIR)$(libdir)
+ 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
+-	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
++	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
+ 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
+ 
+ # --- Clean and Default ---
diff --git a/app-text/mupdf/files/mupdf-1.2-pkg-config.patch b/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
new file mode 100644
index 000000000000..2505a735b513
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
@@ -0,0 +1,17 @@
+no pkgconfig data for jbig2dec and jpeg
+http://bugs.ghostscript.com/show_bug.cgi?id=694301
+
+--- mupdf-1.2-source/debian/mupdf.pc
++++ mupdf-1.2-source/debian/mupdf.pc
+@@ -4,9 +4,8 @@
+ includedir=${prefix}/include
+ 
+ Name: mupdf
+ Description: Library for rendering PDF documents
+-Requires.private: freetype2
++Requires: freetype2 libopenjpeg1
+ Version: 0.5.0
+-Libs: -L${libdir} -lmupdf
++Libs: -L${libdir} -lfitz -ljpeg -ljbig2dec
+-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
+ Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
new file mode 100644
index 000000000000..3c44e98db1ae
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
diff --git a/app-text/mupdf/files/mupdf-1.3-forward_back.patch b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
new file mode 100644
index 000000000000..aafe35af65d7
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
@@ -0,0 +1,25 @@
+Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com 
+on http://bugs.ghostscript.com/show_bug.cgi?id=693494
+
+--- mupdf-1.3/platform/x11/x11_main.c
++++ mupdf-1.3/platform/x11/x11_main.c
+@@ -5,6 +5,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/cursorfont.h>
+ #include <X11/keysym.h>
++#include <X11/XF86keysym.h>
+ 
+ #include <sys/select.h>
+ #include <sys/time.h>
+@@ -836,9 +837,11 @@
+ 						break;
+ 
+ 					case XK_Page_Up:
++					case XF86XK_Back:
+ 						len = 1; buf[0] = ',';
+ 						break;
+ 					case XK_Page_Down:
++					case XF86XK_Forward:
+ 						len = 1; buf[0] = '.';
+ 						break;
+ 					}
diff --git a/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
new file mode 100644
index 000000000000..789e4420c374
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
@@ -0,0 +1,15 @@
+http://bugs.ghostscript.com/show_bug.cgi?id=693518
+
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
+@@ -52,8 +52,8 @@
+ 
+ SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
+ SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
+-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
++SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
++SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
diff --git a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
new file mode 100644
index 000000000000..f943014a6b1d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
@@ -0,0 +1,20 @@
+no pkgconfig data for jbig2dec and jpeg
+http://bugs.ghostscript.com/show_bug.cgi?id=694301
+
+openjpeg-2
+http://bugs.ghostscript.com/show_bug.cgi?id=693518
+
+--- mupdf-1.3/platform/debian/mupdf.pc
++++ mupdf-1.3/platform/debian/mupdf.pc
+@@ -4,9 +4,9 @@
+ includedir=${prefix}/include
+ 
+ Name: mupdf
+ Description: Library for rendering PDF documents
+-Requires.private: freetype2
++Requires: freetype2 libopenjp2 libcrypto
+ Version: 0.5.0
+ Libs: -L${libdir} -lmupdf
+-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
++Libs.private: -lmupdf-js-none
+ Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.3-sys_curl.patch b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
new file mode 100644
index 000000000000..a388c0a26e67
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
+@@ -63,6 +63,8 @@
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
++SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
+ 
+ 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.4-old-debian-files.patch b/app-text/mupdf/files/mupdf-1.4-old-debian-files.patch
new file mode 100644
index 000000000000..cd688cf387f0
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.4-old-debian-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-select-file %f
++TryExec=mupdf-select-file
++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.private: freetype2
++Version: 0.5.0
++Libs: -L${libdir} -lmupdf
++Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
++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.5-Makerules-openssl-curl.patch b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
new file mode 100644
index 000000000000..bc9312a937f1
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
@@ -0,0 +1,27 @@
+--- mupdf-1.5/Makerules
++++ mupdf-1.5/Makerules
+@@ -58,17 +58,23 @@
+ 
+ HAVE_X11 ?= yes
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
+ SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
+ SYS_OPENSSL_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)
+ SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
+-endif
+ SYS_CURL_DEPS = -lpthread -lrt
++endif
++endif
+ 
+ SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
diff --git a/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch b/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch
new file mode 100644
index 000000000000..3dd6419ffffb
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.5-old-debian-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.private: freetype2
++Version: 0.5.0
++Libs: -L${libdir} -lmupdf
++Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
++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.5-openjpeg-2.1.patch b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
new file mode 100644
index 000000000000..70481400edde
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.5/source/fitz/load-jpx.c
++++ mupdf-1.5/source/fitz/load-jpx.c
+@@ -116,7 +116,7 @@
+ 	opj_stream_set_read_function(stream, fz_opj_stream_read);
+ 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+-	opj_stream_set_user_data(stream, &sb);
++	opj_stream_set_user_data(stream, &sb, NULL);
+ 	/* Set the length to avoid an assert */
+ 	opj_stream_set_user_data_length(stream, size);
+ 
diff --git a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
new file mode 100644
index 000000000000..1ccaf32d79bb
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.7a/Makefile
++++ mupdf-1.7a/Makefile
+@@ -98,7 +98,7 @@
+ ifeq "$(HAVE_MUJS)" "yes"
+ PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
+ PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
+-THIRD_LIBS += $(MUJS_LIB)
++THIRD_LIBS +=
+ LIBS += $(MUJS_LIBS)
+ CFLAGS += $(MUJS_CFLAGS)
+ else ifeq "$(HAVE_JSCORE)" "yes"
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
new file mode 100644
index 000000000000..53b35c21cd8f
--- /dev/null
+++ b/app-text/mupdf/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>
+<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.1_p20121127.ebuild b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
new file mode 100644
index 000000000000..81d9add0c4a0
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	>=media-libs/openjpeg-1.5:0
+	virtual/jpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		 "${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-desktop-integration.patch
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+	fi
+}
+
+src_compile() {
+	use X || my_nox11="NOX11=yes MUPDF= "
+
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
+		build=debug verbose=true ${my_nox11}
+}
+
+src_install() {
+	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} install
+
+	insinto /usr/include
+	doins pdf/mupdf{,-internal}.h
+	doins fitz/fitz{,-internal}.h
+	doins xps/muxps{,-internal}.h
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc
+
+	if use X ; then
+		domenu debian/mupdf.desktop
+		doicon debian/mupdf.xpm
+	fi
+	dodoc README doc/{example.c,overview.txt}
+}
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
new file mode 100644
index 000000000000..341f44be6ff9
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-source.zip"
+
+LICENSE="AGPL-3"
+SLOT="0/1.2"
+KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	>=media-libs/openjpeg-1.5:0[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+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] )"
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch \
+		"${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch \
+		"${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch \
+		"${FILESDIR}"/${PN}-1.2-pkg-config.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i debian/mupdf.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = true" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	if ! use X ; then
+		sed -e "\$aNOX11 = yes" \
+			-i Makerules || die
+	fi
+
+	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 '/^X11_LIBS :=/s:\(.*\):\1 -lbz2 -ldl -lpthread:' \
+			-i "${S}"-static/Makerules || die
+		sed -e '/^LIBS +=/s:\(-lfreetype\):\1 -lbz2:' \
+			-i "${S}"-static/Makefile || die
+	fi
+
+	my_soname=libfitz.so.1.2
+	sed -e "\$a\$(FITZ_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/^FITZ_LIB :=/s:=.*:= build/debug/${my_soname}:" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/libfitz.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X ; then
+		domenu debian/mupdf.desktop
+		doicon debian/mupdf.xpm
+	else
+		rm apps/man/mupdf.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/libfitz.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/mupdf
+	fi
+
+	insinto /usr/include
+	doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc
+
+	dodoc CHANGES README doc/{example.c,overview.txt}
+}
diff --git a/app-text/mupdf/mupdf-1.3_p20140118.ebuild b/app-text/mupdf/mupdf-1.3_p20140118.ebuild
new file mode 100644
index 000000000000..e03c4794ac33
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.3_p20140118.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=01f0a0db15faf4bffaa2556ced74868572dac7f5;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.3"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[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?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
+		"${FILESDIR}"/${PN}-1.3-forward_back.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = true" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	if ! use X ; then
+		sed -e "\$aNOX11 = yes" \
+			-i Makerules || die
+	fi
+
+	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.1.3
+	my_soname_js_none=libmupdf-js-none.so.1.3
+	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 "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
+		-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
+		dobin platform/debian/${PN}-select-file
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.4-r1.ebuild b/app-text/mupdf/mupdf-1.4-r1.ebuild
new file mode 100644
index 000000000000..6dfaa97e709a
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.4-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=eebc3385ebfa60574d78cf41badd6622987c1121;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.4"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[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?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
+		"${FILESDIR}"/${PN}-1.3-forward_back.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = yes" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	sed -e "\$aHAVE_X11 = $(usex X 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.1.4
+	my_soname_js_none=libmupdf-js-none.so.1.4
+	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 "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
+		-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
+		dobin platform/debian/${PN}-select-file
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild
new file mode 100644
index 000000000000..791a17d9d5fc
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.5-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.5
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl +openssl static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	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 "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-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.${MY_SOVER}
+	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.6.ebuild b/app-text/mupdf/mupdf-1.6.ebuild
new file mode 100644
index 000000000000..617afb6aef9e
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=9268b59ffcb5e5a276324d692c9d63c0e2f1e3ce;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.6
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl +openssl static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	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 "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-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.${MY_SOVER}
+	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.7.ebuild b/app-text/mupdf/mupdf-1.7.ebuild
new file mode 100644
index 000000000000..a9f3969dce0b
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=0fd24cefd86fb5bb627ee490d3f8127052516c5a;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.7
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl +openssl static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	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 "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-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.${MY_SOVER}
+	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.7a.ebuild b/app-text/mupdf/mupdf-1.7a.ebuild
new file mode 100644
index 000000000000..92f7eb6bc1d4
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.7a.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=987969ac033151810aade57d45c3d968dbf83d60;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+MY_SOVER=1.7
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl javascript +openssl static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	javascript? ( dev-lang/mujs )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+		"${FILESDIR}"/${PN}-1.7a-system-mujs.patch
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	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 "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-e "1iHAVE_MUJS = $(usex javascript)" \
+		-e "1iMUJS_LIBS = -lmujs" \
+		-e "1iMUJS_CFLAGS =" \
+		-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.${MY_SOVER}
+	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
new file mode 100644
index 000000000000..420f7075d015
--- /dev/null
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-2 multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
+#EGIT_HAS_SUBMODULES=1
+
+LICENSE="AGPL-3"
+MY_SOVER=1.7
+SLOT="0/${MY_SOVER}"
+KEYWORDS=""
+IUSE="X vanilla curl openssl static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	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 "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-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.${MY_SOVER}
+	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
+	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
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
new file mode 100644
index 000000000000..b846508aa2ca
--- /dev/null
+++ b/app-text/mythes/Manifest
@@ -0,0 +1 @@
+DIST mythes-1.2.4.tar.gz 4910303 SHA256 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21 WHIRLPOOL c41699774fc81667c2ae3fd41e2ec8165cb99b4680f66f136af9e17f40b90ce9a0a0215668ed9a34e2b76f8f3d4c4b244aae4ed2c51378e27eec678035ad907b
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
new file mode 100644
index 000000000000..f4ff634ffd6c
--- /dev/null
+++ b/app-text/mythes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<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..cb25ea25af86
--- /dev/null
+++ b/app-text/mythes/mythes-1.2.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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..b6c4ea7a2fb1
--- /dev/null
+++ b/app-text/namazu/Manifest
@@ -0,0 +1,2 @@
+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
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..561e1ecf38b0
--- /dev/null
+++ b/app-text/namazu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cjk</herd>
+  <maintainer>
+    <email>hattya@gentoo.org</email>
+  </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..fecdf0f6feb9
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 linguas_ja"
+
+RDEPEND=">=dev-perl/File-MMagic-1.20
+	emacs? ( virtual/emacs )
+	linguas_ja? (
+		app-i18n/nkf
+		|| (
+			dev-perl/Text-Kakasi
+			app-i18n/kakasi
+			app-text/chasen
+			app-text/mecab
+		)
+	)
+	nls? ( virtual/libintl )
+	tk? (
+		dev-lang/tk
+		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..26346655bceb
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 linguas_ja"
+
+RDEPEND=">=dev-perl/File-MMagic-1.20
+	emacs? ( virtual/emacs )
+	linguas_ja? (
+		app-i18n/nkf
+		|| (
+			dev-perl/Text-Kakasi
+			app-i18n/kakasi
+			app-text/chasen
+			app-text/mecab
+		)
+	)
+	nls? ( virtual/libintl )
+	tk? (
+		dev-lang/tk
+		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..aa2741da5ade
--- /dev/null
+++ b/app-text/nfoview/Manifest
@@ -0,0 +1,2 @@
+DIST nfoview-1.10.tar.gz 102058 SHA256 49e771c059824563aa518e163c68da0c08b04bc174521d2ecff7934a550d4b49 SHA512 6114a6944b7886a6def01cd47649109d5e16921128cd8be122cb3395831038037b45160c3f0449e31fbb2bec88ac1e2c07294a5aaceea51a4fea93b7ea4440af WHIRLPOOL 348eb59e68320591f6a6713ca3ce20e44b0c9d07d35edf791619a66c85fec811b6d12951c0690ed5b6650b5a6e8491612a1d426cdbe6121d5e5d29b8c861feb1
+DIST nfoview-1.15.1.tar.xz 88400 SHA256 ed7643a781e9a96a904b1165dbefd0440fa029d25819233f0543925bb7067b1e SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426 WHIRLPOOL da47cc6275fec9a8d01d2bd38eabbf66188eec7c7e6cd657f3ebfbe4b51f010a3dcbd29faad7978aa504a8faa191959d8a3d36b0f54c301c84d3a2b089a4309a
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
new file mode 100644
index 000000000000..7123fa8f9ece
--- /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>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/nfoview/nfoview-1.10.ebuild b/app-text/nfoview/nfoview-1.10.ebuild
new file mode 100644
index 000000000000..824ed221ddef
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="3:3.2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.*"
+
+inherit distutils fdo-mime gnome2-utils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
+		http://github.com/otsaloma/nfoview.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="http://download.gna.org/nfoview/1.10/${P}.tar.gz"
+	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
+	distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	distutils_pkg_postrm
+}
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..809881c5aae5
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.15.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit distutils-r1 fdo-mime gnome2-utils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
+		http://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..e7a3f0d204a3
--- /dev/null
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit distutils-r1 fdo-mime gnome2-utils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
+		http://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/notecase/Manifest b/app-text/notecase/Manifest
new file mode 100644
index 000000000000..102fa874d177
--- /dev/null
+++ b/app-text/notecase/Manifest
@@ -0,0 +1 @@
+DIST notecase-1.9.8_src.tar.gz 928579 SHA256 0b7e23ec97efd5cd4ada651ac93273f9e5ed2cfff027abfb4ae130039563b746 SHA512 9c03da5a4f5290b25c1da32373f3e78d80c514dfed95b2c8f89e561c9acc062e10d3fa1c75241a3452168821ed60182016955b1923a3798fad572e9f5d3fdaf5 WHIRLPOOL 427996fc8d0cfc2bd44e788cb6e1adc69c52260344be0fe48d571edd61ef6b23f80e20a3838322d413a02158a04b2cdfaff5e96e613c6cb077e857f29e75db51
diff --git a/app-text/notecase/files/notecase-1.7.2-CFLAGS.patch b/app-text/notecase/files/notecase-1.7.2-CFLAGS.patch
new file mode 100644
index 000000000000..6eebb8650fbd
--- /dev/null
+++ b/app-text/notecase/files/notecase-1.7.2-CFLAGS.patch
@@ -0,0 +1,29 @@
+--- Makefile.orig	2007-11-13 16:31:55.000000000 +0100
++++ Makefile	2007-11-13 16:33:04.000000000 +0100
+@@ -113,18 +113,9 @@
+ QC=@echo '===> Compiling $<'; 
+ QL=@echo '===> Linking $@'; 
+ 
+-# using "--as-needed" to cut down link requirements (check by "readelf -d /usr/bin/notecase | grep NEEDED") 
+-ifeq ($(LDFLAGS),)
+-ifdef OSX_BUILD
+- LDFLAGS=-Os -Wl -bind_at_load
+-else
+- LDFLAGS=-Os -Wl,--as-needed
+-endif
+-
+ ifneq ($(NOKIA_MAEMO_BUILD),)
+  LDFLAGS += -ansi
+ endif
+-endif
+ 
+ # define compile/link command line with flags
+ CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
+@@ -158,7 +149,6 @@
+  $(OBJ)/IOLayerRedirect.o $(OBJ)/FileExportDlg.o $(OBJ)/FormatIOTxt.o $(OBJ)/FindReplaceDlg.o \
+  $(OBJ)/FindReplaceInfo.o $(OBJ)/LinkInfo.o $(OBJ)/LinkPropertiesDlg.o $(OBJ)/ExecuteFile.o \
+  $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o \
+- $(OBJ)/libz.a \
+  $(OBJ)/ProgressDlg.o $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o \
+  $(OBJ)/FileAttachmentDlg.o $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o \
+  $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o
diff --git a/app-text/notecase/files/notecase-1.9.8-gcc44.patch b/app-text/notecase/files/notecase-1.9.8-gcc44.patch
new file mode 100644
index 000000000000..be34074283f4
--- /dev/null
+++ b/app-text/notecase/files/notecase-1.9.8-gcc44.patch
@@ -0,0 +1,22 @@
+diff -Naurp notecase-1.9.8-orig/src/lib/IniFile.cpp notecase-1.9.8/src/lib/IniFile.cpp
+--- notecase-1.9.8-orig/src/lib/IniFile.cpp	2008-10-24 12:54:50.000000000 -0600
++++ notecase-1.9.8/src/lib/IniFile.cpp	2009-07-27 13:04:34.519339275 -0600
+@@ -9,6 +9,7 @@
+ #include "IniFile.h"

+ #include <algorithm>    //find() function

+ #include <string>

++#include <cstdio>

+ #include "File64.h"

+ #include "FilePath.h"

+ #include "debug.h"

+diff -Naurp notecase-1.9.8-orig/src/_unx/ExecuteFile.cpp notecase-1.9.8/src/_unx/ExecuteFile.cpp
+--- notecase-1.9.8-orig/src/_unx/ExecuteFile.cpp	2008-10-24 12:54:50.000000000 -0600
++++ notecase-1.9.8/src/_unx/ExecuteFile.cpp	2009-07-27 13:07:56.101813217 -0600
+@@ -12,6 +12,7 @@
+ #include "../lib/debug.h"

+ #include <string>

+ #include <cstring>

++#include <cstdio>

+ #include <vector>

+ #include <algorithm>

+ #include <string.h>

diff --git a/app-text/notecase/files/notecase-1.9.8-gtksourceview.patch b/app-text/notecase/files/notecase-1.9.8-gtksourceview.patch
new file mode 100644
index 000000000000..931ef741346d
--- /dev/null
+++ b/app-text/notecase/files/notecase-1.9.8-gtksourceview.patch
@@ -0,0 +1,13 @@
+Index: notecase-1.9.8/Makefile
+===================================================================
+--- notecase-1.9.8.orig/Makefile
++++ notecase-1.9.8/Makefile
+@@ -685,7 +685,7 @@ updatesrc:
+ 		exit 1;\
+ 	fi;  
+ 	$(Q)if [ "$(HAVE_GTKSOURCEVIEW)" = "1" ]; then \
+-		if [[ "$(TEST_SRCVIEW_VER)" < "2.4.1" ]]; then \
++		if [[ "$(TEST_SRCVIEW_VER)" < "2.10.1" ]]; then \
+ 		echo 'ERROR: gtksourceview package is too old ($(shell pkg-config --modversion gtksourceview-2.0))!';\
+ 		exit 1;\
+ 		fi;\
diff --git a/app-text/notecase/metadata.xml b/app-text/notecase/metadata.xml
new file mode 100644
index 000000000000..99d267f38d7b
--- /dev/null
+++ b/app-text/notecase/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">notecase</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/notecase/notecase-1.9.8-r1.ebuild b/app-text/notecase/notecase-1.9.8-r1.ebuild
new file mode 100644
index 000000000000..0a2ded918cdd
--- /dev/null
+++ b/app-text/notecase/notecase-1.9.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils fdo-mime
+
+DESCRIPTION="Hierarchical note manager written using GTK+ and C++"
+HOMEPAGE="http://notecase.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}_src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome nls"
+
+RDEPEND="sys-libs/zlib:0
+	>=x11-libs/gtk+-2.6:2
+	x11-libs/libX11:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig:*"
+
+# test doesn't work
+RESTRICT="test"
+
+src_prepare() {
+	# Respect CFLAGS and don't use --as-needed by default
+	epatch "${FILESDIR}/notecase-1.7.2-CFLAGS.patch"
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gtksourceview.patch
+
+	if ! use gnome; then
+		# Comment variable in the Makefile if we don't have gnome
+		sed -i -e 's/HAVE_GNOME_VFS=1/#HAVE_GNOME_VFS=1/g' \
+				-e 's/AUTODETECT_GNOME_VFS=1/#AUTODETECT_GNOME_VFS=1/g' \
+			 Makefile || die "gnome sed failed"
+	fi
+
+	! use nls && {
+		sed -i -e 's/notecase$(EXE) poinstall/notecase$(EXE)/g' \
+			Makefile || die "nls sed failed"
+		}
+
+	# Verbose building, fix as-needed support and missing libs.
+	sed -e 's/^\(Q[CL]*=\)@.*$/\1/' \
+		-e 's:\(-o $(BIN)/notecase$(EXE) .*\) \($(GTKLIBS)\):\2 -lX11 -lz \1:' \
+		-i Makefile || die
+
+	# Remove Application category from .desktop file.
+	sed -i 's/^\(Categories=\)Application;/\1/' docs/notecase.desktop || die
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+
+	dodoc readme.txt
+}
+
+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/noweb/Manifest b/app-text/noweb/Manifest
new file mode 100644
index 000000000000..46a3f62a4acf
--- /dev/null
+++ b/app-text/noweb/Manifest
@@ -0,0 +1 @@
+DIST noweb-2.11b.tgz 738870 SHA256 c913f26c1edb37e331c747619835b4cade000b54e459bb08f4d38899ab690d82 SHA512 0363c68aa31549fd806a575e6055b117db51fb5b5f28e7b30bdf3c108b3cf9546e1c6a4e64faf892b013c79665b14d436879800d4e970b0732fbd482b416d0f9 WHIRLPOOL b2f357e993d9e4af5b2d2d1f5a9c3bd720a8177b05d01fba501addecf884b739db0b17dd21e8a834a75ec6444d0b5c85679b8e868d3ed2a674010c3441b64f91
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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/noweb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..78391b729fc0
--- /dev/null
+++ b/app-text/noweb/noweb-2.11b-r4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4f7745a3a2c7
--- /dev/null
+++ b/app-text/o3read/Manifest
@@ -0,0 +1 @@
+DIST o3read-0.0.4.tar.gz 21075 SHA256 3704b448099d3396bec4cf503c298628c815703aae12bfcddbac4444bc786430 SHA512 5287a9d58a77cba47397265de9decac1d4327f0a6065cbf7303451d48126a173ad2763157355c9a41237feac6b467ddff5d7e5ad4b4d6c3870f1d09ae0035879 WHIRLPOOL d6b29e83446500fae54701042c0fa29177a99f11ab574708c52d393e08dcb908bbfb901e0b9b3de08867323037ad2471c4bdd6f1db3538fb0cfff74289f7ca8e
diff --git a/app-text/o3read/metadata.xml b/app-text/o3read/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/app-text/o3read/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</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..4159edf447a6
--- /dev/null
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..21f96626093b
--- /dev/null
+++ b/app-text/ocrad/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
new file mode 100644
index 000000000000..860a5b48290e
--- /dev/null
+++ b/app-text/ocrad/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<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..f5abc20baf45
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="http://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..c45d87dc8649
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.23.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="http://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..740a579ad649
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.24.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="http://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..58c56e1c8d10
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.25.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="http://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..439e6a77391d
--- /dev/null
+++ b/app-text/odt2txt/Manifest
@@ -0,0 +1 @@
+DIST odt2txt-0.4.tar.gz 23997 SHA256 a5f4bdf81cdc2afb60fa74ed5da34235eafdc78263f5aaa325193c2bf8d166f8 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4 WHIRLPOOL 905d6e385325d6943011bd0e3053ee82e503c746ef33760377b5737226a0269b39bdd4656316c7102ed5c7349dc5e86b5d689e7fab72a9ac4c49f255cfced4c2
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..02dc900d20df
--- /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>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>clabbe.montjoie@gmail.com</email>
+<name>LABBE Corentin (Montjoie)</name>
+<description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</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..f88213bd685a
--- /dev/null
+++ b/app-text/odt2txt/odt2txt-0.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..02d07a4e51b1
--- /dev/null
+++ b/app-text/openjade/Manifest
@@ -0,0 +1 @@
+DIST openjade-1.3.2.tar.gz 894834 SHA256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1 WHIRLPOOL 3affbfe811a5650a6adcc70e698eb75bafcbc1f1b205a384bd3bf5cd8885cb049a28d818bf3d807e7f9b00f7f998a39c09f68e55e3283abcc42d90d042ddab20
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-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.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..f6bbba8b9a07
--- /dev/null
+++ b/app-text/openjade/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..6f9aba742a7a
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools sgml-catalog eutils flag-o-matic multilib
+
+DESCRIPTION="Jade is an implementation of DSSSL - an ISO standard 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() {
+	# 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..bdcd6531810e
--- /dev/null
+++ b/app-text/openlp/Manifest
@@ -0,0 +1,2 @@
+DIST OpenLP-2.0.4.tar.gz 5805304 SHA256 ffb66cf67b04bf0070444fd4c61fbddb5ba9e411c4fb7b4225b84418e9c25d96 SHA512 314d1ed3ff5c8ff8cf11709941fa95515a899632c210ee67bc9f08c853a8d2bd5f61743a5b2b438fdddebc3cced53fbddd1d1f93e3a4c7b1324a1af3a4e4b2c1 WHIRLPOOL 8125fd331e092daa71093e46bdf99680b5acadfae9b7dde65f0dabe7d25e55c926b98bb69807d419274218c9161b2985c06357129bf928d0fa1ed1058eaf7660
+DIST OpenLP-2.0.5.tar.gz 5806428 SHA256 d1d39282b9a55d031d98d396373416ff0216d44ed5c9f6f747501592fe94699b SHA512 643fb632a430831e8ac697fd895573d56db2c4954aefd5d06bbca39af55cbdc9788aec7366c6663a4fdbf92f0fcb4aeeeef4579b8ca41e3e65a862b322835620 WHIRLPOOL e966b00ecc8c6c067fe78c028e4ebf18256fac417f4e5685e7bc43a7e26f7392a89a44ed6784e6c648a3937dba22c89dc7d2ef94f5dddf363f8b416c255227be
diff --git a/app-text/openlp/metadata.xml b/app-text/openlp/metadata.xml
new file mode 100644
index 000000000000..4a37ec35678b
--- /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>
+		<email>anarchy@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">openlp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/openlp/openlp-2.0.4.ebuild b/app-text/openlp/openlp-2.0.4.ebuild
new file mode 100644
index 000000000000..494899057cdb
--- /dev/null
+++ b/app-text/openlp/openlp-2.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Free church presentation software"
+HOMEPAGE="http://openlp.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/OpenLP-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pyodbc
+	dev-python/PyQt4[X,multimedia,phonon,webkit,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/OpenLP-${PV}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu  resources/openlp.desktop
+	dosym  openlp.pyw /usr/bin/openlp
+	doicon -s scalable resources/images/openlp.svg
+}
diff --git a/app-text/openlp/openlp-2.0.5.ebuild b/app-text/openlp/openlp-2.0.5.ebuild
new file mode 100644
index 000000000000..494899057cdb
--- /dev/null
+++ b/app-text/openlp/openlp-2.0.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Free church presentation software"
+HOMEPAGE="http://openlp.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/OpenLP-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pyodbc
+	dev-python/PyQt4[X,multimedia,phonon,webkit,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/OpenLP-${PV}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu  resources/openlp.desktop
+	dosym  openlp.pyw /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..1894e200e672
--- /dev/null
+++ b/app-text/opensp/Manifest
@@ -0,0 +1 @@
+DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
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..79f0495c7d6b
--- /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>
+		<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..9f9760723e65
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2abcab3598b1
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOMAKE='1.13'
+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"
+
+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}"/${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..a22f6a10bf73
--- /dev/null
+++ b/app-text/ots/Manifest
@@ -0,0 +1 @@
+DIST ots-0.5.0.tar.gz 371126 SHA256 ea908d22256166d1200fef55a82dd3ea8e096a249eaaf0b926f3577f1a63e137 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe WHIRLPOOL 53fbbdc514231531f669eb5635549538f67523503c3550d7bff2deb207e293abc6efee0e6a9b2d627387c8577be971f97188b6fd2e209431b63c90df29c79357
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..571d4e4a95a6
--- /dev/null
+++ b/app-text/ots/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..33c1d78a22ac
--- /dev/null
+++ b/app-text/ots/ots-0.5.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..62c704bc06a9
--- /dev/null
+++ b/app-text/pandoc/Manifest
@@ -0,0 +1,11 @@
+DIST pandoc-1.12.1.tar.gz 991330 SHA256 ce9ac36ba558654dc30793887581ffa6b5c086557418fbec61556cdc1ccb5e33 SHA512 79507c7e447b35ce8b93371968da833153e74bc8a298db623d864f977abf2fa40aebf6bce8bbb5a8f825b8f734afe0a6013018041e29cb530abb12a2b8f02979 WHIRLPOOL b6245a6790fdc6952fd47545c0944806b9ab98ca89b37e6278cc654feb4a0747d0c5ee4eab1f516e55b489d249845e214ec08804c80ad43a96dc0b2d5478e7e0
+DIST pandoc-1.12.2.1.tar.gz 1004090 SHA256 8e9a37bb802efd44e6e6063060105ad4ef8328a093fccbd971c533f0b583dbf7 SHA512 2dc17f6ae9a4cbdeb62aaf1b21b4922f480de425120442bfea1c832a0cf53c25120ded1c91df1e985946c6a5664671075f24edeece163e9d691fea784bab62f8 WHIRLPOOL 8fd4901e6f59b6ea224fe72f427fa80ca61d686b12a9bab19b8add18bdd52952d1f18befc32425299502c0106412b75ddb6afa41c52ff8032a003a87b7d94855
+DIST pandoc-1.12.3.1.tar.gz 1081035 SHA256 ec06bb322950c900f1a69426756fcffa0f5b9fa0a2ffe41337615b261a087c4f SHA512 6fe52fdafe6c3951297d819a137c1c6ea1d86d3173637fb1bf99cade89dc03fe29fd321024c6137747fd81028a0475156c4d8724ad4366cc0a27821bbf75f7e5 WHIRLPOOL 2618c83fa07979fe6f571af690fb0a12177eeca1f65307980c6e809cfee40be889389bf74eb8846899a4ac88757474eb7c18775be769a3bd5d622e4a4240c790
+DIST pandoc-1.12.3.3.tar.gz 1071822 SHA256 ba08dbddac8b3c4e4786ac9213068a77aa5ee41126884fe13d73fc3c12dcfc6c SHA512 3730375823d776185d6e121f509783dd968439fe321a2294f1ae9703d480e7c5e6400c12eb3b5a8874c71fec5352ea77ebd55aa62e524071ca25a7c4e90b4d6a WHIRLPOOL cf209189f564d7b4ae2477e068df84eaa6e193939d2e1eef5282069d94fd5548d30b8f5df24f45d874f49a0ef856334b95a6b093576468e43c622864ad6c11c2
+DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
+DIST pandoc-1.12.4.tar.gz 1046258 SHA256 3efb11b90a7af9c22b1e4b33252a6163c38d52142ee1a3cae5e7170586b9fb36 SHA512 5eb566723276a6196114f0416946488ca26d4077d57540cf1b6578d78f826ff97e7fa14bc21a640eccd014155efc5644d287247146e6cebdb8a6df1444cd70f7 WHIRLPOOL 994c3fc53478acd3c742e55a397bf44e3f0caad629e891a30277a2c81296f19eba3976b8af0fbab87c7e99670877baac623b152e027b9fd14ade9ea513b196c9
+DIST pandoc-1.13.1.tar.gz 1823730 SHA256 7b1bb9b7d66edfbac33796a3f5d3218c2add786b95ea9dfbd497dc0e8ed27e6f SHA512 da699d56916da118159b10306c323f435db2fe0e13a988c319e2ee9faf0082c359b3c7efda03110c20007ae1d23693d0270af095bda90b60dc362f47bf377b8e WHIRLPOOL bcf3ec37e69a76f1bc5a93a34f0822a17516347ec983e3906edbe298cebf3bcfa8e3a1f6136878ca8c69645a7dbcd9122093a3add1911ba54ba03ff8d98497dd
+DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256 66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d WHIRLPOOL 2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622
+DIST pandoc-1.13.2.tar.gz 1980729 SHA256 e65c445f4454e9efcf1bc8c28754260d7108803bd8979bc2ff3c34705e386d8a SHA512 abaf6e7e2b9fe27048044097e15f0ee2891bfab53c148079aa4b8542d76977ee3ea7492c92924c007a1d16a026f5117d7087d3b3cdebae66789dbd2238025b24 WHIRLPOOL f87e05f601058d5f80c7bdd1f8231b5ed9257f66827bd24d3e1d58095911fba011d753b11462d625d56448ca2fe4e0206605b0b6693c831ae12d865e1cc19c02
+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
diff --git a/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch b/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
new file mode 100644
index 000000000000..0ba930f4cfed
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
@@ -0,0 +1,42 @@
+--- pandoc-1.11.1-orig/tests/lhs-test.html+lhs	2013-03-18 09:26:59.000000000 +1100
++++ pandoc-1.11.1/tests/lhs-test.html+lhs	2013-09-14 10:27:51.318546683 +1000
+@@ -30,7 +30,7 @@
+ <h1>lhs test</h1>
+ <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
+ <pre class="sourceCode literate literatehaskell"><code class="sourceCode literatehaskell"><span class="ot">&gt; unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d
+-<span class="ot">&gt;</span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span>
++<span class="ot">&gt;</span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry
+ <span class="ot">&gt;</span>           <span class="co">-- arr (\op (x,y) -&gt; x `op` y)</span></code></pre>
+ <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
+ <pre><code>f *** g = first f &gt;&gt;&gt; second g</code></pre>
+--- pandoc-1.11.1-orig/tests/lhs-test.html	2013-03-18 09:26:59.000000000 +1100
++++ pandoc-1.11.1/tests/lhs-test.html	2013-09-14 10:27:28.671546899 +1000
+@@ -30,7 +30,7 @@
+ <h1>lhs test</h1>
+ <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
+ <pre class="sourceCode literate haskell"><code class="sourceCode haskell"><span class="ot">unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d
+-unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span>
++unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry
+           <span class="co">-- arr (\op (x,y) -&gt; x `op` y)</span></code></pre>
+ <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
+ <pre><code>f *** g = first f &gt;&gt;&gt; second g</code></pre>
+--- pandoc-1.11.1-orig/tests/lhs-test.latex	2013-09-14 10:46:07.412536229 +1000
++++ pandoc-1.11.1/tests/lhs-test.latex	2013-09-14 10:45:51.638536380 +1000
+@@ -21,7 +21,7 @@
+ \usepackage{color}
+ \usepackage{fancyvrb}
+ \newcommand{\VerbBar}{|}
+-\DefineShortVerb[commandchars=\\\{\}]{\|}
++\newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
+ \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
+ % Add ',fontsize=\small' for more characters per line
+ \newenvironment{Shaded}{}{}
+@@ -73,7 +73,7 @@
+ \begin{Shaded}
+ \begin{Highlighting}[]
+ \OtherTok{unsplit ::} \NormalTok{(}\DataTypeTok{Arrow} \NormalTok{a) }\OtherTok{=>} \NormalTok{(b }\OtherTok{->} \NormalTok{c }\OtherTok{->} \NormalTok{d) }\OtherTok{->} \NormalTok{a (b, c) d}
+-\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \FunctionTok{uncurry}
++\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \NormalTok{uncurry}
+           \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)}
+ \end{Highlighting}
+ \end{Shaded}
diff --git a/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch b/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
new file mode 100644
index 000000000000..93528d31204e
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
@@ -0,0 +1,24 @@
+Fails on ghc-7.6 only as:
+
+ tables.man
+ ../dist/build/pandoc/pandoc --data-dir .. tables.native -r native -w man --columns=78
+- 141 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
++ 141 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
+- 177 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
++ 177 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
+- 247 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
++ 247 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
+
+diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
+index 9e74935..d4cf2a9 100644
+--- a/tests/Tests/Old.hs
++++ b/tests/Tests/Old.hs
+@@ -126,7 +126,7 @@ tests = [ testGroup "markdown"
+           ]
+         , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
+           [ "opendocument" , "context" , "texinfo"
+-          , "man" , "plain" , "rtf", "org", "asciidoc"
++          {- , "man" -} , "plain" , "rtf", "org", "asciidoc"
+           ]
+         ]
+ 
diff --git a/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch b/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
new file mode 100644
index 000000000000..ed3c3e89a0be
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
@@ -0,0 +1,62 @@
+--- pandoc-1.11.1-orig/pandoc.cabal	2013-03-18 09:26:59.000000000 +1100
++++ pandoc-1.11.1/pandoc.cabal	2013-08-10 12:52:49.969834000 +1000
+@@ -232,7 +232,7 @@
+                  citeproc-hs >= 0.3.7 && < 0.4,
+                  pandoc-types >= 1.10 && < 1.11,
+                  json >= 0.4 && < 0.8,
+-                 tagsoup >= 0.12.5 && < 0.13,
++                 tagsoup >= 0.12.5 && < 0.14,
+                  base64-bytestring >= 0.1 && < 1.1,
+                  zlib >= 0.5 && < 0.6,
+                  highlighting-kate >= 0.5.3.7 && < 0.6,
+--- /dev/null	2013-08-09 12:59:27.506999856 +1000
++++ pandoc-1.11.1/src/Text/Pandoc/Compat/TagSoupEntity.hs	2013-08-10 12:28:14.261739000 +1000
+@@ -0,0 +1,15 @@
++{-# LANGUAGE CPP #-}
++module Text.Pandoc.Compat.TagSoupEntity (lookupEntity
++                          ) where
++
++import qualified Text.HTML.TagSoup.Entity as TE
++
++lookupEntity :: String -> Maybe Char
++#if MIN_VERSION_tagsoup(0,13,0)
++lookupEntity = str2chr . TE.lookupEntity
++  where str2chr :: Maybe String -> Maybe Char
++        str2chr (Just [c]) = Just c
++        str2chr _ = Nothing
++#else
++lookupEntity = TE.lookupEntity
++#endif
+--- pandoc-1.11.1-orig/src/Text/Pandoc/Parsing.hs	2013-03-18 09:26:57.000000000 +1100
++++ pandoc-1.11.1/src/Text/Pandoc/Parsing.hs	2013-08-10 12:28:14.262814000 +1000
+@@ -159,7 +159,7 @@
+ import Text.Pandoc.Shared
+ import qualified Data.Map as M
+ import Text.TeXMath.Macros (applyMacros, Macro, parseMacroDefinitions)
+-import Text.HTML.TagSoup.Entity ( lookupEntity )
++import Text.Pandoc.Compat.TagSoupEntity ( lookupEntity )
+ import Data.Default
+ import qualified Data.Set as Set
+ import Control.Monad.Reader
+--- pandoc-1.11.1-orig/src/Text/Pandoc/Readers/DocBook.hs	2013-03-18 09:26:57.000000000 +1100
++++ pandoc-1.11.1/src/Text/Pandoc/Readers/DocBook.hs	2013-08-10 12:28:14.264936000 +1000
+@@ -4,7 +4,7 @@
+ import Text.Pandoc.Definition
+ import Text.Pandoc.Builder
+ import Text.XML.Light
+-import Text.HTML.TagSoup.Entity (lookupEntity)
++import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
+ import Data.Generics
+ import Data.Monoid
+ import Data.Char (isSpace)
+--- pandoc-1.11.1-orig/src/Text/Pandoc/XML.hs	2013-03-18 09:26:57.000000000 +1100
++++ pandoc-1.11.1/src/Text/Pandoc/XML.hs	2013-08-10 12:28:17.333957000 +1000
+@@ -39,7 +39,7 @@
+ 
+ import Text.Pandoc.Pretty
+ import Data.Char (ord, isAscii, isSpace)
+-import Text.HTML.TagSoup.Entity (lookupEntity)
++import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
+ 
+ -- | Remove everything between <...>
+ stripTags :: String -> String
diff --git a/app-text/pandoc/files/pandoc-1.11.1-test.patch b/app-text/pandoc/files/pandoc-1.11.1-test.patch
new file mode 100644
index 000000000000..d5d1e894d505
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.11.1-test.patch
@@ -0,0 +1,42 @@
+commit fa978e13658f76be109243224f7491550db74240
+Author: John MacFarlane <fiddlosopher@gmail.com>
+Date:   Tue May 7 20:22:09 2013 -0700
+
+    Use latest highlighting-kate and texmath.
+    
+    Closes #849.
+
+diff --git a/pandoc.cabal b/pandoc.cabal
+index 5f290a9..ea9e850 100644
+--- a/pandoc.cabal
++++ b/pandoc.cabal
+@@ -241,7 +241,7 @@ Library
+                  old-locale >= 1 && < 1.1,
+                  time >= 1.2 && < 1.5,
+                  HTTP >= 4000.0.5 && < 4000.3,
+-                 texmath >= 0.6.1.3 && < 0.7,
++                 texmath >= 0.6.1.5 && < 0.7,
+                  xml >= 1.3.12 && < 1.4,
+                  random >= 1 && < 1.1,
+                  extensible-exceptions >= 0.1 && < 0.2,
+@@ -251,7 +251,7 @@ Library
+                  tagsoup >= 0.12.5 && < 0.13,
+                  base64-bytestring >= 0.1 && < 1.1,
+                  zlib >= 0.5 && < 0.6,
+-                 highlighting-kate >= 0.5.3.7 && < 0.6,
++                 highlighting-kate >= 0.5.3.9 && < 0.6,
+                  data-default >= 0.4 && < 0.6,
+                  temporary >= 1.1 && < 1.2,
+                  blaze-html >= 0.5 && < 0.7,
+diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
+index 16e9a79..2a5025a 100644
+--- a/tests/lhs-test.latex
++++ b/tests/lhs-test.latex
+@@ -22,6 +22,7 @@
+ \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
+ \usepackage{color}
+ \usepackage{fancyvrb}
++\newcommand{\VerbBar}{|}
+ \DefineShortVerb[commandchars=\\\{\}]{\|}
+ \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
+ % Add ',fontsize=\small' for more characters per line
diff --git a/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch b/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
new file mode 100644
index 000000000000..3ed96c2a1b94
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
@@ -0,0 +1,251 @@
+--- pandoc-1.13.2-orig/pandoc.cabal	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/pandoc.cabal	2015-01-05 10:39:17.951823846 +1100
+@@ -250,7 +250,7 @@
+                  hslua >= 0.3 && < 0.4,
+                  binary >= 0.5 && < 0.8,
+                  SHA >= 1.6 && < 1.7,
+-                 haddock-library >= 1.1 && < 1.2,
++                 haddock-library >= 1.1 && < 1.3,
+                  old-time,
+                  deepseq-generics >= 0.1 && < 0.2,
+                  JuicyPixels >= 3.1.6.1 && < 3.3
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Haddock.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Readers/Haddock.hs	2015-01-05 14:24:34.371820789 +1100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {- |
+    Module      : Text.Pandoc.Readers.Haddock
+    Copyright   : Copyright (C) 2013 David Lazar
+@@ -29,7 +30,12 @@
+ readHaddock :: ReaderOptions -- ^ Reader options
+             -> String        -- ^ String to parse
+             -> Pandoc
+-readHaddock opts = B.doc . docHToBlocks . trace' . parseParas
++readHaddock opts =
++#if MIN_VERSION_haddock_library(1,2,0)
++  B.doc . docHToBlocks . trace' . _doc . parseParas
++#else
++  B.doc . docHToBlocks . trace' . parseParas
++#endif
+   where trace' x = if readerTrace opts
+                       then trace (show x) x
+                       else x
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/LaTeX.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Readers/LaTeX.hs	2015-01-05 11:20:35.193045904 +1100
+@@ -592,7 +592,7 @@
+ 
+ unescapeURL :: String -> String
+ unescapeURL ('\\':x:xs) | isEscapable x = x:unescapeURL xs
+-  where isEscapable c = c `elem` "#$%&~_^\\{}"
++  where isEscapable c = c `elem` ("#$%&~_^\\{}" :: String)
+ unescapeURL (x:xs) = x:unescapeURL xs
+ unescapeURL [] = ""
+ 
+@@ -1224,7 +1224,7 @@
+           <* optional sp
+           <* optional (char ',')
+           <* optional sp)
+-  where isBibtexKeyChar c = isAlphaNum c || c `elem` ".:;?!`'()/*@_+=-[]*"
++  where isBibtexKeyChar c = isAlphaNum c || c `elem` (".:;?!`'()/*@_+=-[]*" :: String)
+ 
+ cites :: CitationMode -> Bool -> LP [Citation]
+ cites mode multi = try $ do
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Org.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Readers/Org.hs	2015-01-05 11:24:53.294689830 +1100
+@@ -1,5 +1,6 @@
+ {-# LANGUAGE OverloadedStrings #-}
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE FlexibleContexts #-}
+ {-
+ Copyright (C) 2014 Albert Krewinkel <tarleb@moltkeplatz.de>
+ 
+@@ -1168,7 +1169,7 @@
+ 
+ isUri :: String -> Bool
+ isUri s = let (scheme, path) = break (== ':') s
+-          in all (\c -> isAlphaNum c || c `elem` ".-") scheme
++          in all (\c -> isAlphaNum c || c `elem` (".-" :: String)) scheme
+              && not (null path)
+ 
+ isAbsoluteFilePath :: String -> Bool
+@@ -1214,7 +1215,7 @@
+ solidify = map replaceSpecialChar
+  where replaceSpecialChar c
+            | isAlphaNum c    = c
+-           | c `elem` "_.-:" = c
++           | c `elem` ("_.-:" :: String) = c
+            | otherwise       = '-'
+ 
+ -- | Parses an inline code block and marks it as an babel block.
+@@ -1465,7 +1466,7 @@
+    parseAsMathMLSym :: String -> Maybe Inlines
+    parseAsMathMLSym cs = B.str <$> MathMLEntityMap.getUnicode (clean cs)
+     -- dropWhileEnd would be nice here, but it's not available before base 4.5
+-    where clean = reverse . dropWhile (`elem` "{}") . reverse . drop 1
++    where clean = reverse . dropWhile (`elem` ("{}" :: String)) . reverse . drop 1
+ 
+    state :: ParserState
+    state = def{ stateOptions = def{ readerParseRaw = True }}
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/RST.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Readers/RST.hs	2015-01-05 11:21:59.819266953 +1100
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE OverloadedStrings #-}
++{-# LANGUAGE FlexibleContexts #-}
+ {-
+ Copyright (C) 2006-2014 John MacFarlane <jgm@berkeley.edu>
+ 
+@@ -708,7 +709,7 @@
+ toChunks :: String -> [String]
+ toChunks = dropWhile null
+            . map (trim . unlines)
+-           . splitBy (all (`elem` " \t")) . lines
++           . splitBy (all (`elem` (" \t" :: String))) . lines
+ 
+ codeblock :: Maybe String -> String -> String -> RSTParser Blocks
+ codeblock numberLines lang body =
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/TWiki.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Readers/TWiki.hs	2015-01-05 11:25:22.450138135 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances #-}
++{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances, FlexibleContexts #-}
+ -- RelaxedPolyRec needed for inlinesBetween on GHC < 7
+ {-
+   Copyright (C) 2014 Alexander Sulfrian <alexander.sulfrian@fu-berlin.de>
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Templates.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Templates.hs	2015-01-05 10:45:45.255969737 +1100
+@@ -124,7 +124,7 @@
+                    -> String           -- ^ Name of writer
+                    -> IO (Either E.IOException String)
+ getDefaultTemplate user writer = do
+-  let format = takeWhile (`notElem` "+-") writer  -- strip off extensions
++  let format = takeWhile (`notElem` ("+-" :: String)) writer  -- strip off extensions
+   case format of
+        "native" -> return $ Right ""
+        "json"   -> return $ Right ""
+@@ -288,7 +288,7 @@
+ reservedWords = ["else","endif","for","endfor","sep"]
+ 
+ skipEndline :: Parser ()
+-skipEndline = P.try $ P.skipMany (P.satisfy (`elem` " \t")) >> P.char '\n' >> return ()
++skipEndline = P.try $ P.skipMany (P.satisfy (`elem` (" \t" :: String))) >> P.char '\n' >> return ()
+ 
+ pConditional :: Parser Template
+ pConditional = do
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ConTeXt.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/ConTeXt.hs	2015-01-05 11:36:04.213852145 +1100
+@@ -119,7 +119,7 @@
+ toLabel :: String -> String
+ toLabel z = concatMap go z
+  where go x
+-         | elem x "\\#[]\",{}%()|=" = "ux" ++ printf "%x" (ord x)
++         | elem x ("\\#[]\",{}%()|=" :: String) = "ux" ++ printf "%x" (ord x)
+          | otherwise = [x]
+ 
+ -- | Convert Elements to ConTeXt
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/EPUB.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/EPUB.hs	2015-01-05 11:35:29.166882307 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns #-}
++{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns, FlexibleContexts #-}
+ {-
+ Copyright (C) 2010-2014 John MacFarlane <jgm@berkeley.edu>
+ 
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ICML.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/ICML.hs	2015-01-05 11:35:07.163880901 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE OverloadedStrings #-}
++{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
+ 
+ {- |
+    Module      : Text.Pandoc.Writers.ICML
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/LaTeX.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/LaTeX.hs	2015-01-05 11:32:29.461099578 +1100
+@@ -240,7 +240,7 @@
+  where go [] = ""
+        go (x:xs)
+          | (isLetter x || isDigit x) && isAscii x = x:go xs
+-         | elem x "-+=:;." = x:go xs
++         | elem x ("-+=:;." :: String) = x:go xs
+          | otherwise = "ux" ++ printf "%x" (ord x) ++ go xs
+ 
+ -- | Puts contents into LaTeX command.
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Markdown.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/Markdown.hs	2015-01-05 11:34:25.437241616 +1100
+@@ -323,9 +323,9 @@
+                     then Just $ writerColumns opts
+                     else Nothing
+   let rendered = render colwidth contents
+-  let escapeDelimiter (x:xs) | x `elem` ".()" = '\\':x:xs
+-                             | otherwise      = x : escapeDelimiter xs
+-      escapeDelimiter []                      = []
++  let escapeDelimiter (x:xs) | x `elem` (".()" :: String) = '\\':x:xs
++                             | otherwise                  = x : escapeDelimiter xs
++      escapeDelimiter []                                  = []
+   let contents' = if isEnabled Ext_all_symbols_escapable opts &&
+                      not (stPlain st) && beginsWithOrderedListMarker rendered
+                      then text $ escapeDelimiter rendered
+@@ -681,7 +681,7 @@
+   mapM (inlineToMarkdown opts) (avoidBadWraps lst) >>= return . cat
+   where avoidBadWraps [] = []
+         avoidBadWraps (Space:Str (c:cs):xs)
+-          | c `elem` "-*+>" = Str (' ':c:cs) : avoidBadWraps xs
++          | c `elem` ("-*+>" :: String) = Str (' ':c:cs) : avoidBadWraps xs
+         avoidBadWraps (x:xs) = x : avoidBadWraps xs
+ 
+ escapeSpaces :: Inline -> Inline
+@@ -821,8 +821,8 @@
+            sdoc <- inlineListToMarkdown opts sinlines
+            let k' = text (modekey m ++ "@" ++ k)
+                r = case sinlines of
+-                        Str (y:_):_ | y `elem` ",;]@" -> k' <> sdoc
+-                        _                             -> k' <+> sdoc
++                        Str (y:_):_ | y `elem` (",;]@" :: String) -> k' <> sdoc
++                        _                                         -> k' <+> sdoc
+            return $ pdoc <+> r
+         modekey SuppressAuthor = "-"
+         modekey _              = ""
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/OpenDocument.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/OpenDocument.hs	2015-01-05 11:36:22.915591722 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE PatternGuards, OverloadedStrings #-}
++{-# LANGUAGE PatternGuards, OverloadedStrings, FlexibleContexts #-}
+ {-
+ Copyright (C) 2008-2014 Andrea Rossato <andrea.rossato@ing.unitn.it>
+                         and John MacFarlane.
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/RST.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/RST.hs	2015-01-05 11:32:00.815007351 +1100
+@@ -105,7 +105,7 @@
+          -> State WriterState Doc
+ keyToRST (label, (src, _)) = do
+   label' <- inlineListToRST label
+-  let label'' = if ':' `elem` (render Nothing label')
++  let label'' = if ':' `elem` ((render Nothing label') :: String)
+                    then char '`' <> label' <> char '`'
+                    else label'
+   return $ nowrap $ ".. _" <> label'' <> ": " <> text src
+@@ -333,12 +333,12 @@
+         okAfterComplex :: Inline -> Bool
+         okAfterComplex Space = True
+         okAfterComplex LineBreak = True
+-        okAfterComplex (Str (c:_)) = isSpace c || c `elem` "-.,:;!?\\/'\")]}>–—"
++        okAfterComplex (Str (c:_)) = isSpace c || c `elem` ("-.,:;!?\\/'\")]}>–—" :: String)
+         okAfterComplex _ = False
+         okBeforeComplex :: Inline -> Bool
+         okBeforeComplex Space = True
+         okBeforeComplex LineBreak = True
+-        okBeforeComplex (Str (c:_)) = isSpace c || c `elem` "-:/'\"<([{–—"
++        okBeforeComplex (Str (c:_)) = isSpace c || c `elem` ("-:/'\"<([{–—" :: String)
+         okBeforeComplex _ = False
+         isComplex :: Inline -> Bool
+         isComplex (Emph _) = True
+--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Texinfo.hs	2014-12-20 19:18:27.000000000 +1100
++++ pandoc-1.13.2/src/Text/Pandoc/Writers/Texinfo.hs	2015-01-05 11:33:07.407217820 +1100
+@@ -368,7 +368,7 @@
+ 
+ -- periods, commas, colons, and parentheses are disallowed in node names
+ disallowedInNode :: Char -> Bool
+-disallowedInNode c = c `elem` ".,:()"
++disallowedInNode c = c `elem` (".,:()" :: String)
+ 
+ -- | Convert inline element to Texinfo
+ inlineToTexinfo :: Inline    -- ^ Inline to convert
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..72bbcbf76c85
--- /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>
+  <herd>haskell</herd>
+  <maintainer>
+    <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>
+  </use>
+</pkgmetadata>
diff --git a/app-text/pandoc/pandoc-1.12.1-r1.ebuild b/app-text/pandoc/pandoc-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..280068ddc542
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.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"
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[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.7:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[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.5:=[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.2:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.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/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?]
+	>=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
+	>=dev-haskell/text-0.11:=[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.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[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.0.0
+	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/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
+		>=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 \
+		'text >= 0.11 && < 0.12' 'text >= 0.11'
+}
+
+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.12.1.ebuild b/app-text/pandoc/pandoc-1.12.1.ebuild
new file mode 100644
index 000000000000..933db100f7da
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.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"
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[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.7:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[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.5:=[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.2:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.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/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?]
+	>=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[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.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[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.0.0
+	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/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
+		>=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_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.12.2.1.ebuild b/app-text/pandoc/pandoc-1.12.2.1.ebuild
new file mode 100644
index 000000000000..4a1e712e878b
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.2.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.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 +http-conduit"
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[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.7:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[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.5:=[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.2:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.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/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?]
+	>=dev-haskell/texmath-0.6.5.2:=[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.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[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.0.0
+	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/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
+		>=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 \
+		'http-conduit >= 1.9 && < 1.10' 'http-conduit >= 1.9 && < 2.1' \
+		'text >= 0.11 && < 0.12' 'text >= 0.11 && < 1.2'
+}
+
+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.12.3.1.ebuild b/app-text/pandoc/pandoc-1.12.3.1.ebuild
new file mode 100644
index 000000000000..10154e4ebd88
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.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"
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[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.7:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[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.6:=[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.2:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.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/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.12.5:=[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:=[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.3:=[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.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[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.0.0
+	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/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
+		>=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_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.12.3.3.ebuild b/app-text/pandoc/pandoc-1.12.3.3.ebuild
new file mode 100644
index 000000000000..80eced40d6ee
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.3.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.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"
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.12:=[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.6:=[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.2:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.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/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.12.5:=[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:=[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.3:=[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.0.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.1:=[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.0.0
+	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/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
+		>=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.7' 'QuickCheck >= 2.4 && < 2.8'
+}
+
+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.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
new file mode 100644
index 000000000000..01c7cc50a261
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.12.4.ebuild b/app-text/pandoc/pandoc-1.12.4.ebuild
new file mode 100644
index 000000000000..daf762c61b14
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.12:=[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.7:=[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.3:=[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.7 <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_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.1-r3.ebuild b/app-text/pandoc/pandoc-1.13.1-r3.ebuild
new file mode 100644
index 000000000000..ca8f912a1318
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.13.1-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3.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"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[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/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.2:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.8.5:=[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/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.2:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[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:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[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 <dev-haskell/quickcheck-2.8
+		>=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 \
+		'text >= 0.11 && < 1.2' 'text >= 0.11' \
+		'random >= 1 && < 1.1' 'random >=1 && <1.2' \
+		'http-client >= 0.3.2 && < 0.4' 'http-client >= 0.3.2 && < 0.5'
+}
+
+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)
+}
diff --git a/app-text/pandoc/pandoc-1.13.2-r1.ebuild b/app-text/pandoc/pandoc-1.13.2-r1.ebuild
new file mode 100644
index 000000000000..7c9178080c5a
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.13.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit base 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"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[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/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/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/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/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 )
+"
+
+PATCHES=("${FILESDIR}/${PN}-1.13.2-ghc-7.10.patch")
+
+src_prepare() {
+	base_src_prepare
+	cabal_chdeps \
+		'filepath >= 1.1 && < 1.4' 'filepath >= 1.1' \
+		'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4'
+}
+
+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)
+}
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..c25f434f06d9
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.13.2.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.13.2.ebuild b/app-text/pandoc/pandoc-1.13.2.ebuild
new file mode 100644
index 000000000000..dc8d82a48169
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.13.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.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 +https make-pandoc-man-pages +network-uri trypandoc"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[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/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.2:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.11.1:=[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/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/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 <dev-haskell/quickcheck-2.8
+		>=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_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)
+}
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..6fc102179199
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.14.0.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..977ff37b4d8d
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.15.0.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/paperwork/Manifest b/app-text/paperwork/Manifest
new file mode 100644
index 000000000000..ba8a2585a343
--- /dev/null
+++ b/app-text/paperwork/Manifest
@@ -0,0 +1,2 @@
+DIST paperwork-0.2.3.tar.gz 164350 SHA256 92f7ef27d26b9b4d3e1d4f87b2788e47cfef0fb386ca813daf02e486e791ccf6 SHA512 e9b423dc35b1c952eca93a891b94b1d25d1af612c22671ccae0b37a32bc29ceb800d0ab9a300d12d0eb4dceb45843ef4123c1796f94a82a40292ad3848ba7d12 WHIRLPOOL 3d1f07a89e9a3177fc4c10d699328ce91e27e76fcb2b6ae704e7f12e11bcbd48fafc88ef07cf6c4903d9c8d7774e7daa47b8ce5bd7fb694ab303cbff8c6c6f94
+DIST paperwork-0.2.4.tar.gz 164449 SHA256 361970a69995ead1a07a9fe63dde1055110194e447bbfb357b95ac45918ce23c SHA512 a21875f78e38ef77c05f21b57491fa89b7bb9ceeda5d577cd1082825b7df7e56ce9a7a2f7477b066b81a8858183607a25e999e0f851848393c155c9f8588b634 WHIRLPOOL f9b02780437feb0fb0eba2a2a436cf855d0efde85877f8d6533fb613110171e2ec9bf1dff31ffab5e5e21c1d7ac180f42eb5eed38a0416e6cba41cc36fadefa2
diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml
new file mode 100644
index 000000000000..ecf855ccb6e4
--- /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>
+    <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">jflesch/paperwork</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/paperwork/paperwork-0.2.3.ebuild b/app-text/paperwork/paperwork-0.2.3.ebuild
new file mode 100644
index 000000000000..c4e74de49516
--- /dev/null
+++ b/app-text/paperwork/paperwork-0.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+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/poppler[introspection]
+	dev-python/joblib[${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/pyinsane-1.3.8[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	<dev-python/whoosh-2.7.0[${PYTHON_USEDEP}]
+	dev-util/glade[introspection,python]
+	sci-libs/scikits_learn[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-0.2.4.ebuild b/app-text/paperwork/paperwork-0.2.4.ebuild
new file mode 100644
index 000000000000..e29dedb316da
--- /dev/null
+++ b/app-text/paperwork/paperwork-0.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+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/poppler[introspection]
+	dev-python/joblib[${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/pyinsane-1.3.8[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]
+	dev-util/glade[introspection,python]
+	sci-libs/scikits_learn[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	virtual/python-imaging[${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..d22b202b982d
--- /dev/null
+++ b/app-text/paps/Manifest
@@ -0,0 +1 @@
+DIST paps-0.6.8.tar.gz 460062 SHA256 db214c4ea7ecde2f7986b869f6249864d3ff364e6f210c15aa2824bcbd850a20 SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba WHIRLPOOL 69291aeadac3d85c1f0ca53bbe09b0510949b75159ca138c3102e1708e898a50a38fa4b78c9003957fb83da82ade57a5e26be8b63bb68c2022148f45f2615e27
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-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
new file mode 100644
index 000000000000..30b456e77416
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -0,0 +1,13 @@
+--- paps-0.6.8/src/libpaps.c
++++ paps-0.6.8/src/libpaps.c
+@@ -25,8 +25,8 @@
+ 
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ftglyph.h>
++#include <ftoutln.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..44391868e500
--- /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>
+		<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-r1.ebuild b/app-text/paps/paps-0.6.8-r1.ebuild
new file mode 100644
index 000000000000..6068f606da2f
--- /dev/null
+++ b/app-text/paps/paps-0.6.8-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+
+	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/paps/paps-0.6.8.ebuild b/app-text/paps/paps-0.6.8.ebuild
new file mode 100644
index 000000000000..8cee860e557b
--- /dev/null
+++ b/app-text/paps/paps-0.6.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit flag-o-matic
+
+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"
+
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
diff --git a/app-text/par/Manifest b/app-text/par/Manifest
new file mode 100644
index 000000000000..d61e19abfd5f
--- /dev/null
+++ b/app-text/par/Manifest
@@ -0,0 +1 @@
+DIST Par152.tar.gz 47999 SHA256 33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e WHIRLPOOL 750392d8f4bfccbff6931b221b426b9dfd08568d0e20ea5833672e76baa213992878d690565a973d6e86e5974b89c203418805fe77227a392bb3740103497192
diff --git a/app-text/par/metadata.xml b/app-text/par/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /dev/null
+++ b/app-text/par/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>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/par/par-1.52.ebuild b/app-text/par/par-1.52.ebuild
new file mode 100644
index 000000000000..3ea939c65cda
--- /dev/null
+++ b/app-text/par/par-1.52.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 || die
+	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..e5cb78bc313e
--- /dev/null
+++ b/app-text/passivetex/Manifest
@@ -0,0 +1 @@
+DIST passivetex-1.25.zip 1190258 SHA256 a92669d54ace92b828378fa51f3c7b0faa2e43cf42d7bfbe2506a0a984c1b439 SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b WHIRLPOOL 383eec514dbb8ed26b7dd120c07dfe60642a5b0f11df40be83cdc3d0eb76d09e8ec5dfc9f05bd413df45a56f16916c66df694e18eac856c13b34d907a2a2f8a3
diff --git a/app-text/passivetex/metadata.xml b/app-text/passivetex/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/passivetex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..58c4ae3e1178
--- /dev/null
+++ b/app-text/passivetex/passivetex-1.25.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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..2504a0060d23
--- /dev/null
+++ b/app-text/pastebinit/Manifest
@@ -0,0 +1,2 @@
+DIST pastebinit-1.3.1.tar.bz2 35582 SHA256 0dcb6c4820f49cc7f97a7804254df1ae848cfc4fc63e08ca89a525b909709e29 SHA512 f9c4eafbe194dc7fe85ae37005846c38fe9863ed18406953fa6974d979592d74a01eba4dfde3e91da121d36355d87fd2464b565d0eb6aa0091b2b338989567bf WHIRLPOOL 42c58f5cad96361c7f254a17db5a14304ec523b1a50548f27c0a77336e9384f971267a753c1fbc538301dee6cd1d228333976d96618dec8d33539a3e85771525
+DIST pastebinit-1.4.1.tar.bz2 39202 SHA256 c23720ff19d239f7ae62dd7dc28f453aaea4823af29b1595ba2e58fe232988e6 SHA512 40cfdc22a9d168b239c799ecefca8b9a4f873edeb868803d8de4e57b291f695b9aa3f0b04d87b29ca1777917a53f0c210f20fa8661673630e9a29331e10dc065 WHIRLPOOL 49425b36db3477cd141eee676aa256c8d65567c189dd2cf90bfc53a29824f9611f5d9e54d1d470fdd747bacf141198fe49df7c25c83c96c98da85e3026af3056
diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml
new file mode 100644
index 000000000000..87d7228d29dc
--- /dev/null
+++ b/app-text/pastebinit/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>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+	<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.3.1-r2.ebuild b/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..30eee6fde197
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.3.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1
+
+DESCRIPTION="A software that lets you send anything you want directly to a
+pastebin from the command line."
+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"
+
+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
+}
+
+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_replicate_script "${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/pastebinit/pastebinit-1.4.1.ebuild b/app-text/pastebinit/pastebinit-1.4.1.ebuild
new file mode 100644
index 000000000000..8abca4fa4293
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit python-single-r1
+
+DESCRIPTION="A software that lets you send anything you want directly to a
+pastebin from the command line."
+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..c29a61944c58
--- /dev/null
+++ b/app-text/pdf2djvu/Manifest
@@ -0,0 +1,2 @@
+DIST pdf2djvu-0.7.19.tar.xz 227248 SHA256 c783cea31bf4016dbf85e242a2ebcb54fe70a41bcb046e1dd0cb502a7f5f003c SHA512 7e7ab8e92eb2f57dc678771333bb6c9f88ad460585cc8b886ae10f9c120833b3d95587f94c86ab1b152d6836d5531f64d031af33d95fc96f8219cd611cfe300f WHIRLPOOL 8434cd0ab7901176b3833ddabe7ed3eed8f5b4227afeff72b10e501009a02a6e67ad83d7ae261577945e3c97c5eb61ad36ff805891d94cfd27c517e5a916b2a7
+DIST pdf2djvu-0.7.21.tar.xz 229020 SHA256 12d480cc3ce2369e1f1b39b7f5e6fbb44351d8b07861295d34e6978f58b687b9 SHA512 920e49b23f9c1d1a8f6c0be9257dc175ef94350f6e488d88813eb2586344f373b4b173530031d9aeff24b1ad220cc68a3094d4e821cd3a1511ba01e492ed084f WHIRLPOOL 7d09ca40f330c79c0a1abf9967f9ce5d05cfaa8a5904bf69c751a4ca1cce5da2987c519cc001dd7b3fdaa0822127e3ead269ee723f78c6cc18d1c7666b8b28e5
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
new file mode 100644
index 000000000000..8e976c442203
--- /dev/null
+++ b/app-text/pdf2djvu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>printing</herd>
+  <use>
+    <flag name='graphicsmagick'>Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/pdf2djvu/pdf2djvu-0.7.19.ebuild b/app-text/pdf2djvu/pdf2djvu-0.7.19.ebuild
new file mode 100644
index 000000000000..292a05bd1d5d
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.7.19.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://code.google.com/p/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? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use test && python-single-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.7.21.ebuild b/app-text/pdf2djvu/pdf2djvu-0.7.21.ebuild
new file mode 100644
index 000000000000..653e9bbc712e
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.7.21.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-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? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use test && python-single-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/pdf2html/Manifest b/app-text/pdf2html/Manifest
new file mode 100644
index 000000000000..dd02d94b84b0
--- /dev/null
+++ b/app-text/pdf2html/Manifest
@@ -0,0 +1 @@
+DIST pdf2html-1.4.tgz 22976 SHA256 71ee70c56ec1629442518992e1de743287d7b8799d0aae75e3be8095f7245b61 SHA512 00488c5e6303e1609294e7873c892866d19f3ee820f22f2d75436de22037bf3e4e1a565b7db29df5f6b20a76c5e2df4786e39e1d803cd7cca88274da65c7bbbb WHIRLPOOL b2b85e7bf705fcb1cbeca36d66593342725bcc6cccf699ae443b0150f757ed54ead385c7f7e84302a51d3cc995a3ee066980447d6948518f685edf7236df7d87
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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/pdf2html/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..33dbc37bf12a
--- /dev/null
+++ b/app-text/pdf2html/pdf2html-1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
new file mode 100644
index 000000000000..d5ee29092f80
--- /dev/null
+++ b/app-text/pdf2oo/Manifest
@@ -0,0 +1 @@
+DIST pdf2oo-20090715.tar.gz 14765 SHA256 e779e80f5c052dc7d3ccf5baf2dae81353c3f56b376cbd633bbb608979450df8 SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5 WHIRLPOOL 36b729a2c395a4fe45eb14aded9628e5b074c790578d72c6a2ac3213ad29f69ab362ac611031d3e82d1f2121d0f60734eab6ef5bf938d26913f8509b3474853d
diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
new file mode 100644
index 000000000000..d71993eed9ea
--- /dev/null
+++ b/app-text/pdf2oo/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pdf2oo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pdf2oo/pdf2oo-20090715.ebuild b/app-text/pdf2oo/pdf2oo-20090715.ebuild
new file mode 100644
index 000000000000..11d129e05394
--- /dev/null
+++ b/app-text/pdf2oo/pdf2oo-20090715.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Converts pdf files to odf"
+HOMEPAGE="http://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
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	>=app-text/poppler-0.12.3-r3[utils]"
+
+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..3bc822464b94
--- /dev/null
+++ b/app-text/pdfgrep/Manifest
@@ -0,0 +1,2 @@
+DIST pdfgrep-1.3.1.tar.gz 111653 SHA256 6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437 SHA512 7a13016a8cf4f8a7387940d7e3862a1fb83f3aa6240084f835e92e958836dff0788db2ae39f35db25d679a2857ddf0b9bcbd7b1aacb10c2a16c3165d56f4efcf WHIRLPOOL 94b69bd0e16d4f0b1b389b09c2330516f25cc772be58e7ad49a2cf1ac0633539bb16a5df595052f468ab89d38ebeeb26b7f2be866555756f423febbf0a600b4b
+DIST pdfgrep-1.3.2.tar.gz 114754 SHA256 386b167434443dd299d389a0ef292d708123255cbab0e179e11b65ba51d9b386 SHA512 dd5d26999405e1e84f5639ea48e15d2aab951a766f828e8e7b45409a7e027a5312757ac64952da56b8a37cf0cd0bc6f43cd16d78600dcc6c8fcb4deabecf0a5b WHIRLPOOL d2ca79e647a21767e0296d72dcdb511157352adf1f1d60beec9d15eb46554f3ec6d9c11f1dfda8988d4f6dcf4a814c52a8ffc28f72c2f227e01430354a8b99f9
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
new file mode 100644
index 000000000000..e77acea2191a
--- /dev/null
+++ b/app-text/pdfgrep/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<description>Tree Proxy</description>
+	</maintainer>
+	<maintainer>
+		<email>flo@geekplace.eu</email>
+		<description>Maintainer, CC him on bugs</description>
+	</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.3.1.ebuild b/app-text/pdfgrep/pdfgrep-1.3.1.ebuild
new file mode 100644
index 000000000000..a45031e5aaab
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool similar to grep which searches text in PDFs"
+HOMEPAGE="http://pdfgrep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="unac"
+
+RDEPEND="
+	app-text/poppler:=[cxx]
+	unac? ( app-text/unac )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_with unac)
+}
diff --git a/app-text/pdfgrep/pdfgrep-1.3.2.ebuild b/app-text/pdfgrep/pdfgrep-1.3.2.ebuild
new file mode 100644
index 000000000000..3fb4ddad0dab
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-1.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A tool similar to grep which searches text in PDFs"
+HOMEPAGE="http://pdfgrep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="unac"
+
+RDEPEND="
+	app-text/poppler:=[cxx]
+	unac? ( app-text/unac )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_with unac)
+}
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
new file mode 100644
index 000000000000..59d7aa912871
--- /dev/null
+++ b/app-text/pdfjam/Manifest
@@ -0,0 +1 @@
+DIST pdfjam_208.tgz 180725 SHA256 c731c598cfad076c985526ff89cbf34423a216101aa5e2d753a71de119ecc0f3 SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c WHIRLPOOL 18ff3ade14664694cc910d7d458f7f573ed32b05055d71d38eab03bb9238af92e03f9af8bb77f636b295b0cc90d68ca7e87a147febbce4036e14bbda0115ee42
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
new file mode 100644
index 000000000000..21ff3a538481
--- /dev/null
+++ b/app-text/pdfjam/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+</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..fb888e75c3b2
--- /dev/null
+++ b/app-text/pdfjam/pdfjam-2.08.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..a2b17c76ca62
--- /dev/null
+++ b/app-text/pdfminer/Manifest
@@ -0,0 +1,2 @@
+DIST pdfminer-20131113.tar.gz 4080763 SHA256 1016246265f9d48645229164ef44483e9b9a1b3e6902783782f9ae4e1024ea19 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e WHIRLPOOL 91980937f332332591d31241c558176dcd3cdc5da065fa9e748463d39f582facbef8e64c10155e691bdd938589c6616136c2cd63bf91ad1f54852e116edc5cee
+DIST pdfminer-20140328.tar.gz 4081233 SHA256 ba187b93056586a14edd5e630cf63ae96b1cc84b611f55dcddbc997316d9f262 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a WHIRLPOOL 0f1e5e10936d2a6f02872699812e4b8449875330f1dbb668a15c5a85c94d3cb2cf5cb471fb280159df20fa454344b1256469180cdfb5ec3091df07e49c283264
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
new file mode 100644
index 000000000000..6814ae17fc95
--- /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>
+	<herd>python</herd>
+	<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..029256e13ec3
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20131113.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/ http://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.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
new file mode 100644
index 000000000000..7ddb6758d0e6
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/ http://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..67b94d72e7c0
--- /dev/null
+++ b/app-text/pdfsandwich/Manifest
@@ -0,0 +1 @@
+DIST pdfsandwich-0.1.4.tar.bz2 16401 SHA256 8b82f3ae08000c5cae1ff5a0f6537b0b563befef928e5198255b743a46714af3 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171 WHIRLPOOL d8eb5fd281b1eb3f9e371ee71c486b8e839048f3ab569f8b62644e21ad921692283b2d35dfeb07111f86cf52eeb926da4152fcf58124cca2f96aa05116e8e115
diff --git a/app-text/pdfsandwich/metadata.xml b/app-text/pdfsandwich/metadata.xml
new file mode 100644
index 000000000000..6bfdb50e39db
--- /dev/null
+++ b/app-text/pdfsandwich/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>
+		<email>tomka@gentoo.org</email>
+	</maintainer>
+	<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.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.4.ebuild
new file mode 100644
index 000000000000..23bf7abd4bea
--- /dev/null
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	|| (
+	   media-gfx/imagemagick[png?]
+	   media-gfx/graphicsmagick[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..06c1cb46d2b2
--- /dev/null
+++ b/app-text/pdfshuffler/Manifest
@@ -0,0 +1 @@
+DIST pdfshuffler-0.6.0.tar.gz 48071 SHA256 df3629b5a0ba91fda6b703ddf7b3e6f224a01d5cdfb76a5de77d67615466ef58 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe WHIRLPOOL 72463cd666892af708208fd5816d882d956e3c068744e270775079107ea3b583cb81adc0225fc2e88232df3c74d292056804fff6bf64e707afe17359eaba21a4
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..da959993d99a
--- /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>
+	<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..c5cc668648f6
--- /dev/null
+++ b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/pdfshuffler/pdfshuffler-0.6.0.ebuild b/app-text/pdfshuffler/pdfshuffler-0.6.0.ebuild
new file mode 100644
index 000000000000..28777dc16fba
--- /dev/null
+++ b/app-text/pdfshuffler/pdfshuffler-0.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit distutils eutils fdo-mime gnome2-utils
+
+DESCRIPTION="PDF-Shuffler is GUI app that can merge or split pdfs and rotate, crop and rearrange their pages"
+HOMEPAGE="http://sourceforge.net/projects/pdfshuffler/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/pyPdf
+	dev-python/python-poppler"
+RDEPEND="${DEPEND}"
+
+DOCS="ChangeLog README TODO AUTHORS"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	distutils_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..027bf396e583
--- /dev/null
+++ b/app-text/pdftk/Manifest
@@ -0,0 +1 @@
+DIST pdftk-2.02-src.zip 2239008 SHA256 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54 WHIRLPOOL 910ee5f755e7ea46043cece0bd9a6645dc8a503280fd7d86eb2f77d303af0031b5e428cc7222cee23995e6fe5aefd142a610c77ec9969142e841e0f18153e082
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..a8a5788d684c
--- /dev/null
+++ b/app-text/pdftk/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+<herd>java</herd>
+</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..eeb47b04d20a
--- /dev/null
+++ b/app-text/pdftk/pdftk-2.02.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..154203d2a687
--- /dev/null
+++ b/app-text/peg-markdown/Manifest
@@ -0,0 +1 @@
+DIST peg-markdown-0.4.14.tar.gz 85692 SHA256 111bc56058cfed11890af11bec7419e2f7ccec6b399bf05f8c55dae0a1712980 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e WHIRLPOOL ae799da2be4d5dde55d73fd841063a88242a6e6cddb1473cda847a32d53a3f75b100937df0b07b1a83bbf995ae9a125bda9ace19809318d56b7eb646aabd781b
diff --git a/app-text/peg-markdown/metadata.xml b/app-text/peg-markdown/metadata.xml
new file mode 100644
index 000000000000..bcf02e7f7440
--- /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>
+		<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..c9f0478c7c35
--- /dev/null
+++ b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8828ebfa502a
--- /dev/null
+++ b/app-text/pelican/Manifest
@@ -0,0 +1,3 @@
+DIST pelican-3.4.0.tar.gz 755768 SHA256 54f9b63f24db7db7cc2aae25b239707af3ec582fa585cf864d9f50dfd4ed1d93 SHA512 358563998eb1e333007f90f9d6f97ed842e42240966ab329dd08d1dcc2c70dd9793604745ed14369a1736a01268b55c101304ae265c6b5bf4179bb4363706a0b WHIRLPOOL 8e2f085fd956d4037372e30304874dea294b8237904ab44d0d70b01c1282f8849202790e194f3e2512af2460bc1da3a44146e50bd91cea20e0cbd804c74c43c9
+DIST pelican-3.5.0.tar.gz 766994 SHA256 0a93e6c8cdccf5c6de61d96e5604185f71de3b29b313d0d378d188cb22821849 SHA512 fdb9fd202933dac29861e6bb9937aed13259c5808391499d9e43e619bfe89fcf10286f452f9c6d3beb7e3ee9de4c2c8b573a7f7a2d03e0159afe26f19a4b8396 WHIRLPOOL 2a6ca7b85c372cf37a98d3407b38cd5fd320053df32c7112c53ee3f336b69d3636b571a11e17afbe63e0d78398fc715f3009da04ef018be5f63c16ddf9af7ce6
+DIST pelican-3.6.0.tar.gz 773887 SHA256 ff0db0e355295d1170988dc6d22388f3681f75accd51d02455638ad18a85c837 SHA512 7c4bcda6155b363d9e0d31d1763f20f9e3a3e9c5cd250ef4ce02305504e910c3ad61b3ae4ab909d1bca51a46102fe59583a6700f5a32a14d0c1cde47507db3d0 WHIRLPOOL 6685061f617f56b36cdb29f303765eace8703229caaae7d680b035a6a38ff7341bf72e06c8f980a8b28f156f429995e3e91c752337bd14fd9641813f63957131
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
new file mode 100644
index 000000000000..594cbf009e4a
--- /dev/null
+++ b/app-text/pelican/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>
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pelican</remote-id>
+    <remote-id type="github">getpelican/pelican</remote-id>
+  </upstream>
+  <use>
+    <flag name="markdown">Markdown support</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/pelican/pelican-3.4.0.ebuild b/app-text/pelican/pelican-3.4.0.ebuild
new file mode 100644
index 000000000000..f39bdcfbe150
--- /dev/null
+++ b/app-text/pelican/pelican-3.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files"
+HOMEPAGE="http://pelican.notmyidea.org/ http://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[${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.5.0.ebuild b/app-text/pelican/pelican-3.5.0.ebuild
new file mode 100644
index 000000000000..4567f25ff98f
--- /dev/null
+++ b/app-text/pelican/pelican-3.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files"
+HOMEPAGE="http://pelican.notmyidea.org/ http://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.0.ebuild b/app-text/pelican/pelican-3.6.0.ebuild
new file mode 100644
index 000000000000..25a51e46989c
--- /dev/null
+++ b/app-text/pelican/pelican-3.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files"
+HOMEPAGE="http://pelican.notmyidea.org/ http://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/pep/Manifest b/app-text/pep/Manifest
new file mode 100644
index 000000000000..ea5643705b79
--- /dev/null
+++ b/app-text/pep/Manifest
@@ -0,0 +1 @@
+DIST pep28.zip 83969 SHA256 108fe13e0038284c7939414687c7efee7af73f73c387048ac574e6196d295af4 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8 WHIRLPOOL 46343ea72b1d5797a217d7e3b8066e4f594460ec2b2409a1fc4099e444d5329e2cd3e6bf867576a45197809fce17512f4ae86bc320720b1d89c0818a04ab43d1
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..91f4e72fb544
--- /dev/null
+++ b/app-text/pep/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</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..0c0efde5005b
--- /dev/null
+++ b/app-text/pep/pep-2.8-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..fad28162d57c
--- /dev/null
+++ b/app-text/pinfo/Manifest
@@ -0,0 +1 @@
+DIST pinfo-0.6.10.tar.bz2 133059 SHA256 122180a0c23d11bc9eb569a4de3ff97d3052af96e32466fa62f2daf46ff61c5d SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e WHIRLPOOL 92878e887f52729a266e99b25ea671f54f0cb5f11680c018bfb92a70de4ff2927ee59cf01e4fddbfe9c78c7c61b8c0dfd6edfcc761a0e6ddb6e751e0e6220047
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-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..3fcf9a077c2a
--- /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>
+<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..793f3b4ec3a7
--- /dev/null
+++ b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	sys-libs/readline
+	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
+
+	eautoreconf
+
+	append-cflags -D_BSD_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..2a58986d8c5d
--- /dev/null
+++ b/app-text/po4a/Manifest
@@ -0,0 +1 @@
+DIST po4a_0.45.orig.tar.gz 2208959 SHA256 f5f47db85b48893d87d921152c96082233975bd0e0a9ee14f58c07d7dff81678 SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f WHIRLPOOL 404bb45412fff4cec13304490e5f74ee4a4573d3c755491816cfe501c3e83dbdb58ae3c799516fe21c692c9de6fbc2dd5a261c8039eca2e2777365b27ac358cd
diff --git a/app-text/po4a/files/0.41-po4a-build.patch b/app-text/po4a/files/0.41-po4a-build.patch
new file mode 100644
index 000000000000..f869775ccee2
--- /dev/null
+++ b/app-text/po4a/files/0.41-po4a-build.patch
@@ -0,0 +1,16 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -29,7 +29,12 @@
+     my $self = shift;
+     $self->depends_on('binpo');
+     $self->make_files_writable("po/pod");
+-    system("./share/po4a-build -f po4a-build.conf") && die;
++    { # Fix for massive slowdown/Memory consumption
++       open( my $fh, '-|', qw( ./share/po4a-build -f po4a-build.conf ))  or die;
++       while( defined ( my $line = <$fh> ) ){
++          print $line;
++       }
++    }
+     File::Path::mkpath( File::Spec->catdir( 'blib', 'manl10n' ), 0, oct(777) );
+     system ("cp -R _build/po4a/man/* blib/manl10n") && die;
+ }
diff --git a/app-text/po4a/files/compare-po.pl b/app-text/po4a/files/compare-po.pl
new file mode 100644
index 000000000000..c01b9b8f31ee
--- /dev/null
+++ b/app-text/po4a/files/compare-po.pl
@@ -0,0 +1,37 @@
+#! /usr/bin/perl
+#  Remove header entry of two PO files and compare them
+
+my $f1 = shift(@ARGV);
+my $f2 = shift(@ARGV);
+
+open IN1, "<", $f1 or die "Unable to read 1st file: $!\n";
+open IN2, "<", $f2 or die "Unable to read 2nd file: $!\n";
+my $inMsgstr = 0;
+my $lineno = 0;
+while (<IN1>) {
+	$lineno ++;
+	if (m/^msgstr/) {
+		$inMsgstr = 1;
+	} elsif ($inMsgstr == 1 && $_ !~ /^"/) {
+		last;
+	}
+}
+$inMsgstr = 0;
+while (<IN2>) {
+	if (m/^msgstr/) {
+		$inMsgstr = 1;
+	} elsif ($inMsgstr == 1 && $_ !~ /^"/) {
+		last;
+	}
+}
+
+# Now compare lines
+while (<IN1>) {
+	$lineno ++;
+	my $l2 = <IN2> or die "Unexpected EOF found when reading $f2\n";
+	$_ eq $l2 or die "Files $f1 and $f2 differ at line $lineno:\n-$_+$l2\n";
+}
+close IN1;
+die "EOF expected at 2nd file\n" unless eof(IN2);
+close IN2;
+exit 0;
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
new file mode 100644
index 000000000000..c75fe577173e
--- /dev/null
+++ b/app-text/po4a/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>fatzer2@gmail.com</email>
+	<name>Alexander Golubev</name>
+	<description>Proxu maintainer. Assign bugs on him</description>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/po4a/po4a-0.45-r1.ebuild b/app-text/po4a/po4a-0.45-r1.ebuild
new file mode 100644
index 000000000000..ee2d7e292581
--- /dev/null
+++ b/app-text/po4a/po4a-0.45-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Needed because this package also installs to vendor_perl
+GENTOO_DEPEND_ON_PERL_SUBSLOT="yes"
+inherit perl-app
+
+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 ~ia64-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"
diff --git a/app-text/po4a/po4a-0.45-r2.ebuild b/app-text/po4a/po4a-0.45-r2.ebuild
new file mode 100644
index 000000000000..b4c3282b3d0e
--- /dev/null
+++ b/app-text/po4a/po4a-0.45-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ia64-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() {
+		local locale=$1
+		local locale_abs_path="$locales_path/$locale.po"
+		locales_to_remove+=$locale_abs_path
+	}
+
+	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 ..."
+
+	# 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/podofo/Manifest b/app-text/podofo/Manifest
new file mode 100644
index 000000000000..7bf9d44ce1af
--- /dev/null
+++ b/app-text/podofo/Manifest
@@ -0,0 +1,3 @@
+DIST podofo-0.9.2-freetype251.patch 1106 SHA256 324889c99eccafb5e4732d65d325453470ca659c5b43b2e9265f7e5d3fd8bbeb SHA512 185d9e16587fec922720042e7a604ae4b1c5b36c115beebf08ff73a46bf2859b25b0dda6b858f31e2fab3dfa88c79265e5d4e0da30091e83b22dff2bdaa2b6da WHIRLPOOL b9fb89a41be7ed16f1b0ca78e0ec95427133077c8b7b5c120a713d38624bb51eb8fe5dd08d1c9bf1b2ed5fd077222b6e40d224583c6436c7ee117caf7e310dbf
+DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb
+DIST podofo-0.9.3.tar.gz 1135095 SHA256 ec261e31e89dce45b1a31be61e9c6bb250532e631a02d68ec5bb849ef0a222d8 SHA512 c9a8076821502225d3ecf5a7e79ef2ebd7b9cc3e7d0902eabff33325b124109a1f5038f57b83e3fad0d82cff9cd557a9ed177adc7c176064085070aebcd7602d WHIRLPOOL 44268efd48d6ab35fecf31e3ff773f6d9fcca091026f423ccffbe8afdb09fff9446eed8c64db9a4482695d6e4f4ae4585d7e51036197f619a7c304df1a8de8c2
diff --git a/app-text/podofo/metadata.xml b/app-text/podofo/metadata.xml
new file mode 100644
index 000000000000..3bfca4c6aace
--- /dev/null
+++ b/app-text/podofo/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>
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="boost">Add support for boost</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">podofo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/podofo/podofo-0.9.2.ebuild b/app-text/podofo/podofo-0.9.2.ebuild
new file mode 100644
index 000000000000..5c830bb5a486
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="http://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://sourceforge/podofo/${P}.tar.gz
+	http://dev.gentoo.org/~polynomial-c/${PN}-0.9.2-freetype251.patch"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
+IUSE="+boost idn debug test"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	dev-libs/openssl: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() {
+	epatch "${DISTDIR}"/${PN}-0.9.2-freetype251.patch
+
+	local x sed_args
+
+	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
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		$(cmake-utils_use_want boost)
+		$(cmake-utils_use_has idn LIBIDN)
+		$(cmake-utils_use_has test CPPUNIT)
+		)
+
+	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.3.ebuild b/app-text/podofo/podofo-0.9.3.ebuild
new file mode 100644
index 000000000000..767b20921ca6
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="http://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://sourceforge/podofo/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn debug test"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	dev-libs/openssl: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
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		$(cmake-utils_use_want boost)
+		$(cmake-utils_use_has idn LIBIDN)
+		$(cmake-utils_use_has test CPPUNIT)
+		)
+
+	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..4e09beef6d55
--- /dev/null
+++ b/app-text/poppler-data/Manifest
@@ -0,0 +1 @@
+DIST poppler-data-0.4.7.tar.gz 4182339 SHA256 e752b0d88a7aba54574152143e7bf76436a7ef51977c55d6bd9a48dccde3a7de SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2 WHIRLPOOL 4e939252767112723678fe8771f958eeef6d3fd26224c26ecf54feb2a7a29510d86f183f1b8267fcf56848a24fb6e3e3c4c001145edd9751d953cb882585b827
diff --git a/app-text/poppler-data/metadata.xml b/app-text/poppler-data/metadata.xml
new file mode 100644
index 000000000000..1fa0ca569505
--- /dev/null
+++ b/app-text/poppler-data/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>printing</herd>
+</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..9005c1b74212
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..30a9f7435634
--- /dev/null
+++ b/app-text/poppler/Manifest
@@ -0,0 +1,3 @@
+DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
+DIST poppler-0.33.0.tar.xz 1613060 SHA256 a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6 SHA512 8d3e05d9663df56d75018dc5c72173ec8b2d3290ce0118dc3a6ea149499dc8c3a0b70963630b1b3ca3067761886539a04310f168de180d3e56a08ac6483721d4 WHIRLPOOL c520831f4677ecebe24e2c1fefd28e723ced82730a73a006c3ba1fb5e598d822f0758c7063586c2b90602b20c39e45bd93c409bc880eddf1d1c75ecac27acb4b
+DIST poppler-0.34.0.tar.xz 1615264 SHA256 1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0 SHA512 5b027da7a35b07d52b8d06c7756e430346a8954add1ad89d30f383a586c4939d9b899236aa0623d894a96e779af2cb89e55ad89e50f3ed99d7489578a48d5a15 WHIRLPOOL a4f6c582ff03b06d69d25cbcf448b000724d5c35816ebe7b730dca1ae62bfe647b975ddd4a2f352b5ad149eb63d7d9e93670e5bfd359f5f4be150ab57631aec5
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/metadata.xml b/app-text/poppler/metadata.xml
new file mode 100644
index 000000000000..9124e13b642e
--- /dev/null
+++ b/app-text/poppler/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<herd>printing</herd>
+<maintainer>
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
+<use>
+	<flag name='introspection'>Enable GObject introspection.</flag>
+	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/poppler/poppler-0.32.0.ebuild b/app-text/poppler/poppler-0.32.0.ebuild
new file mode 100644
index 000000000000..28e9680530c2
--- /dev/null
+++ b/app-text/poppler/poppler-0.32.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc x86"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/51"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms 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:0 )
+	lcms? ( media-libs/lcms:2 )
+	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.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" )
+
+src_configure() {
+	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_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with tiff)
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg1)
+	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
+
+	if use cairo && use doc; 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.33.0-r1.ebuild b/app-text/poppler/poppler-0.33.0-r1.ebuild
new file mode 100644
index 000000000000..595c6a55d355
--- /dev/null
+++ b/app-text/poppler/poppler-0.33.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/52"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms 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 )
+	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.4 )
+"
+
+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"
+)
+
+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
+}
+
+src_configure() {
+	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_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with 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.34.0.ebuild b/app-text/poppler/poppler-0.34.0.ebuild
new file mode 100644
index 000000000000..4cfcacdc40a4
--- /dev/null
+++ b/app-text/poppler/poppler-0.34.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/53"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms 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 )
+	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.4 )
+"
+
+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"
+)
+
+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
+}
+
+src_configure() {
+	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_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with 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-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
new file mode 100644
index 000000000000..595c6a55d355
--- /dev/null
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/52"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms 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 )
+	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.4 )
+"
+
+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"
+)
+
+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
+}
+
+src_configure() {
+	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_XPDF_HEADERS=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use_with 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/ps2eps/Manifest b/app-text/ps2eps/Manifest
new file mode 100644
index 000000000000..2956a102ff50
--- /dev/null
+++ b/app-text/ps2eps/Manifest
@@ -0,0 +1 @@
+DIST ps2eps-1.68.tar.gz 97304 SHA256 b08f12eed88965d1891261fb70e87c7e3a3f3172ebc31bdb7994a7ce854dd925 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b WHIRLPOOL 231f22ccfff1341ca9ac713254786028b422df9e805754b4631e6d73146413ccfc7ac9306433c45c63c3ad7499065f444580da8125a15a6120dae1c9cdc536ac
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
new file mode 100644
index 000000000000..8c2230e6ced9
--- /dev/null
+++ b/app-text/ps2eps/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>printing</herd>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</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..28394703a4a1
--- /dev/null
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generate Encapsulated Postscript Format (EPS,EPSF) 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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..d35c27d7adfb
--- /dev/null
+++ b/app-text/ps2pkm/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/app-text/ps2pkm/metadata.xml b/app-text/ps2pkm/metadata.xml
new file mode 100644
index 000000000000..709c45b017d6
--- /dev/null
+++ b/app-text/ps2pkm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</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..070a860998dc
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20120701.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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.5_p20130530.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20130530.ebuild
new file mode 100644
index 000000000000..f9410d237f49
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20130530.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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.5_p20140525.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild
new file mode 100644
index 000000000000..7ad46cf8b162
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit flag-o-matic toolchain-funcs
+
+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 ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-libs/kpathsea-6.2.0"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	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..bf9e80c8e5d9
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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..f6a4f6491ee1
--- /dev/null
+++ b/app-text/psiconv/Manifest
@@ -0,0 +1 @@
+DIST psiconv-0.8.3.tar.gz 326460 SHA256 4fec0d7c1d18f593e9a90a7dc08d84489aa92828849bd4ff393eab20f44543b8 SHA512 a48814f64fd2c3dda0dfa13c331d2d60ff8674ab7a56f51efcad29d3dd6874f4b94dc0a21ef3066b0fa605b18635ee151fbb4e3eeb06dab3854a329ed70348a9 WHIRLPOOL 79e024d60c8621dcc8a36cba29109d358241ecff3dd3fec38c32d0b187c03ba947a7d8495bf384ebe3e87efda89e170315da1ab8952dba0b03232980a026373b
diff --git a/app-text/psiconv/metadata.xml b/app-text/psiconv/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/app-text/psiconv/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>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</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..8c54d544d899
--- /dev/null
+++ b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a6595acd2550
--- /dev/null
+++ b/app-text/pspdftool/Manifest
@@ -0,0 +1 @@
+DIST pspdftool-0.03.tar.bz2 129936 SHA256 18e932c35221861909528c6a358f404720ce911a7a139bcf6376eb6fc2fde610 SHA512 8e621719c59f79f7201e8221a851e85d11573fa1895a64ab5e77382fa1103004f70a38f98928a8ce4b5795ce89ac3e4a7a5eade772959e26e49d6db9cc7fe7ea WHIRLPOOL 1db9fb41af6a70dc6de4799199b657038755a938dc89872a9ccb6e3a7fb22bfca8cb83befe8471ea3f65cf4e74113e96b4fc67f7d2e88fc51f27d6f04b99f9d0
diff --git a/app-text/pspdftool/metadata.xml b/app-text/pspdftool/metadata.xml
new file mode 100644
index 000000000000..0b14fb209f4a
--- /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>
+		<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..1b36b92b5667
--- /dev/null
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/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="http://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..7b39916051c3
--- /dev/null
+++ b/app-text/pspdftool/pspdftool-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/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="http://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..fb4d2505078f
--- /dev/null
+++ b/app-text/pspresent/Manifest
@@ -0,0 +1 @@
+DIST pspresent-1.3.tar.gz 14357 SHA256 94f2b6fa437929c9add2b8f4554a204d49132170c1d167c4389c7de26f5a6f80 SHA512 cfca0b4758d03051cea95d077a45239103f6fd24dada775c3b7fb0b7f78863f6628b530a21834546546dc935596b6d93dbe45048a661fcc41152a4b97b8f21f3 WHIRLPOOL 2704797e1ae5bf7c7876f7cb79be57ac430fe2dc7ea7b0297fe77381f073c406eddc3878da247da6811755a9058290bad70495f597aef77a93fc4de1aa0edc86
diff --git a/app-text/pspresent/metadata.xml b/app-text/pspresent/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/app-text/pspresent/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>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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..80511bf7ea00
--- /dev/null
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a279a7d9ad97
--- /dev/null
+++ b/app-text/pstotext/Manifest
@@ -0,0 +1 @@
+DIST pstotext-1.9.tar.gz 37461 SHA256 cfe0a251d0d43982a7d3bdf1d1670c854432739d00cb593c9beaca4b2cc36c27 SHA512 a8148e94d635544a7dfa8c96ff6071717388e4dc6c3db36f2c50939dce96c1f824ee423b1622af9111fffc60cb298215a6ee85d956c81873d71ceac804ee48ca WHIRLPOOL 2e2bec427d230c007687af13425ff6ac366e8b868950d8338855451c63ecc0ff401e14d5ddc6ee645e4dc209d4a5af5d772dcf1f8e2299917c1c3ce8d234017e
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..21ff3a538481
--- /dev/null
+++ b/app-text/pstotext/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/pstotext/pstotext-1.9-r3.ebuild b/app-text/pstotext/pstotext-1.9-r3.ebuild
new file mode 100644
index 000000000000..75857bb812d0
--- /dev/null
+++ b/app-text/pstotext/pstotext-1.9-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+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"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-quote-chars-fix.patch \
+		"${FILESDIR}"/${PV}-flags.patch
+	tc-export CC
+}
+
+src_install () {
+	dobin pstotext || die
+	doman pstotext.1 || die
+}
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
new file mode 100644
index 000000000000..388fda34fb44
--- /dev/null
+++ b/app-text/psutils/Manifest
@@ -0,0 +1 @@
+DIST psutils_1.17.dfsg.orig.tar.gz 40296 SHA256 53e24aff04895b47fb2178dc9df3acb78d91c33c2d6bd524c49e9641479c4f6c SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3 WHIRLPOOL a621251c2956f40eeacbae77a68287a808446655b15d9c17b5d51d3f1946ddb427ae12a6172d49f5c82f31afb3b54fcf00f12aeb258e0cd08b7c9a60df1524f6
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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/psutils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..22ecb3f2b010
--- /dev/null
+++ b/app-text/psutils/psutils-1.17-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~x86-freebsd ~x86-interix ~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/pybookreader/Manifest b/app-text/pybookreader/Manifest
new file mode 100644
index 000000000000..56478e9880b0
--- /dev/null
+++ b/app-text/pybookreader/Manifest
@@ -0,0 +1 @@
+DIST PyBookReader-0.5.0.tar.gz 285488 SHA256 785f1e5d6629a966d1833e525d6b4c1bc5f7e4328164ff00e4050c6bbeac3ed9 SHA512 0eb3b71b58c62706ac6cca70150d28071a0a24e02ae2949a8a26c02f5d060effec941d97ad3c5e4fc5a47fb222c315a91258ef31360e2f164f85b6728e6e239d WHIRLPOOL 41d1947bc1f56a356fe885057db89b5a8021583df13f11d869a2b9c7bb4f6056f782442f478b943d5f06da520bb0bd5e2a05692c08e49f4b5ffe3258bf5047bd
diff --git a/app-text/pybookreader/metadata.xml b/app-text/pybookreader/metadata.xml
new file mode 100644
index 000000000000..75e858eb1854
--- /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>
+		<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.ebuild b/app-text/pybookreader/pybookreader-0.5.0.ebuild
new file mode 100644
index 000000000000..e39a2bb5e716
--- /dev/null
+++ b/app-text/pybookreader/pybookreader-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* 2.5 2.7-pypy-* *-jython"
+
+inherit distutils
+
+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
+	dev-libs/libxml2[python]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_MODNAME="ornamentbook pybookreader"
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
new file mode 100644
index 000000000000..8a2e486ac996
--- /dev/null
+++ b/app-text/pylize/Manifest
@@ -0,0 +1 @@
+DIST pylize-1.3b.tar.bz2 70979 SHA256 8de876e2581a556e23d538b3ed5b970929a51c236b24c1fd5161c26c8c42bb44 SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454 WHIRLPOOL cc81f7000fedf10d3aae1922c3334bd00575a45c0a17bcdcb899e6b5229c621637b3f7815e5af8c08303ffa57d7db9073be675419fd8e9afe0e70e4eecf7f679
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..280f01f0e4ad
--- /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>
+  <herd>python</herd>
+  <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..3aa768cda609
--- /dev/null
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}]
+	virtual/python-imaging[${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..192b6019d5dd
--- /dev/null
+++ b/app-text/pytextile/Manifest
@@ -0,0 +1,3 @@
+DIST textile-2.1.8.tar.gz 34002 SHA256 c443f4bf0a31df9e707e615f869d4f51b08cdb222d17ca3009eda44f7cfd8629 SHA512 b1675a131b482f4926efb45312b16c722ff158d9296704918b56316d470056f986ce18d495525a8e9f236bdd62e09ca6a17b443a7db8c8c36e5d05fcffce67da WHIRLPOOL fedcd9b9277387604e258fca427e3cd587f3b2ba93e65b39474ce57810fa67dae772241c5cf69dc8aaf89416d6191271f1fece4fa2f2e63f19fec6597b956bd5
+DIST textile-2.2.1.tar.gz 32631 SHA256 4899f06c63bfdc32a204d4c1c1e9302ddf17f26c20328419747d109348e23afd SHA512 81d044deaa765693078d949672affa787a4e15882cc2928fd19c3abe69256ffbeec1308b303ee694a80787ad7574b57ab4b256f111d9874e72440809236f6b93 WHIRLPOOL 3fda8226310d998b7d40d9fec6398173c8398c44704dd151400d284ba5a897a56bee6d3f17a21ed8fc01e76cea88f41a8372b90a4ad8a7eb6627de550dd0ef89
+DIST textile-2.2.2.tar.gz 32844 SHA256 dba4f1cb5772b99dbe4d521807a3255ddbbfa971da8b054afa08f0b428bced28 SHA512 19f2ed92199549549b07c2bb3accdf483c409c2dfd17e43ae38ba8babbc2c72d662d78414de0fd1c64b65eae59ce9e591ab9c863d4f806b7c454d8a37567d882 WHIRLPOOL a2cf3f1ef03ccac807582fd9ca44acc7f6bf48d56445a9a73d756400c7b2f7952f3222ce87caa6dfded27c4a4f55feee57f2e3194082b2d44841b4953821ca0f
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..6c8bf0f9e05b
--- /dev/null
+++ b/app-text/pytextile/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <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..7621f60564ed
--- /dev/null
+++ b/app-text/pytextile/pytextile-2.1.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python implementation of Textile, Dean Allen's Human Text Generator for creating (X)HTML"
+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.2.1.ebuild b/app-text/pytextile/pytextile-2.2.1.ebuild
new file mode 100644
index 000000000000..9ce8fb6e522d
--- /dev/null
+++ b/app-text/pytextile/pytextile-2.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python implementation of Textile, Dean Allen's Human Text Generator for creating (X)HTML"
+HOMEPAGE="http://github.com/textile/python-textile"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${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() {
+	nosetests textile/tests/ || die "Tests failed under ${EPYTHON}"
+}
diff --git a/app-text/pytextile/pytextile-2.2.2.ebuild b/app-text/pytextile/pytextile-2.2.2.ebuild
new file mode 100644
index 000000000000..9ce8fb6e522d
--- /dev/null
+++ b/app-text/pytextile/pytextile-2.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python implementation of Textile, Dean Allen's Human Text Generator for creating (X)HTML"
+HOMEPAGE="http://github.com/textile/python-textile"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${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() {
+	nosetests textile/tests/ || die "Tests failed under ${EPYTHON}"
+}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
new file mode 100644
index 000000000000..609085aed236
--- /dev/null
+++ b/app-text/qpdf/Manifest
@@ -0,0 +1,2 @@
+DIST qpdf-5.1.1.tar.gz 7662701 SHA256 95d355d8fa5e1c677e04d884161de94f5438bf3bdc1638498796b042bad4a726 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993 WHIRLPOOL 66eee10dc5163f1e53afcbd02b71bab73598c28ebb9b005c26af4e58396fd693af7ed76a17fd0c29819b0fa08a71ea0158c76bfa0b0d452a78bb357277644459
+DIST qpdf-5.1.2.tar.gz 7664268 SHA256 e9dd8d5d0a322078ffd573f057f03d24a734cc5b7dd925b089ebcb0f6e867bfd SHA512 be2fe3f1127532edc1b3d9af2d25df64c2c04c402cfef8d1ca5ed77129c2f17ef3435abb6c630b260ee4be8458984c0fbf0abfb6cda82ef4fa74dc23ca7a8864 WHIRLPOOL 5ec875f0ea73aa044c671f4ea9e5b69c74c188463ad58006a55ed395fed4e0184baad760486596586866b9f701ae5e211ac08ade1eff54028e20c6c1462ee629
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
new file mode 100644
index 000000000000..7db5520ddbda
--- /dev/null
+++ b/app-text/qpdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">qpdf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/qpdf/qpdf-5.1.1.ebuild b/app-text/qpdf/qpdf-5.1.1.ebuild
new file mode 100644
index 000000000000..bcd0f7f4745b
--- /dev/null
+++ b/app-text/qpdf/qpdf-5.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A command-line program that does structural, content-preserving transformations on 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 static-libs test"
+
+RDEPEND="dev-libs/libpcre
+	sys-libs/zlib
+	>=dev-lang/perl-5.8"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl
+	)"
+
+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 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.2.ebuild b/app-text/qpdf/qpdf-5.1.2.ebuild
new file mode 100644
index 000000000000..67e53490cb7d
--- /dev/null
+++ b/app-text/qpdf/qpdf-5.1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A command-line program that does structural, content-preserving transformations on 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 static-libs test"
+
+RDEPEND="dev-libs/libpcre
+	sys-libs/zlib
+	>=dev-lang/perl-5.8"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl
+	)"
+
+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 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/qpdfview/Manifest b/app-text/qpdfview/Manifest
new file mode 100644
index 000000000000..c1a18069a3cf
--- /dev/null
+++ b/app-text/qpdfview/Manifest
@@ -0,0 +1,2 @@
+DIST qpdfview-0.4.13.tar.gz 563548 SHA256 8ff563055fb4df476afed08ead465e6204c16fc419a483ebf3dbe89779f28e41 SHA512 0246a2954ca01a1b3df69473ee53c7674ee891c460a26aebbf8acf2505692ec40eb712388893eddf6954180ddadb7965f173b9e55a3574f2cc8c0820d78be952 WHIRLPOOL 702ba4b5f1c597dfb4483775d9b089ff263594d99f7c9866c81ffb1a7755615b960c90a3b6c7cb8ea4b0d078c7d80b645612b5ce2eb618b2fedb785a6c67a725
+DIST qpdfview-0.4.15.tar.gz 611036 SHA256 a2dca83bc12c1241fc0603f8fb029a5d5011c68f9266d4a3a804fb75bf00f271 SHA512 dd87bcb62af75e3d96197f2ff6a76dde5c4a418dd6989050b9a606370b4a7f437a8a94fdef5f947e519b2880cb374af5f406ff4201bcd52da7a98949e63b02e4 WHIRLPOOL b78b76fa29f7775c3120bfd4487fb0dbcad82da923d5f02ba160912a9ecc1cc5831353b999c2ec36d9dbc7e464b650e4c1f753eb0f5ebe7d3014c0fb568dcf82
diff --git a/app-text/qpdfview/files/qpdfview-0.4.12-no_sql.patch b/app-text/qpdfview/files/qpdfview-0.4.12-no_sql.patch
new file mode 100644
index 000000000000..874c89357e34
--- /dev/null
+++ b/app-text/qpdfview/files/qpdfview-0.4.12-no_sql.patch
@@ -0,0 +1,14 @@
+--- sources/database.cpp.org	2014-10-22 12:28:30.305031435 +0200
++++ sources/database.cpp	2014-10-22 12:29:14.735028437 +0200
+@@ -366,11 +366,6 @@
+ 
+         transaction.commit();
+     }
+-
+-#else
+-
+-    Q_UNUSED(bookmarks);
+-
+ #endif // WITH_SQL
+ }
+ 
diff --git a/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch b/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch
new file mode 100644
index 000000000000..1a5e16124807
--- /dev/null
+++ b/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch
@@ -0,0 +1,21 @@
+Upstream:
+http://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/1391
+Gentoo bugzilla:
+https://bugs.gentoo.org/show_bug.cgi?id=493514
+=== modified file 'sources/database.h'
+--- sources/database.h	2013-11-25 16:06:34 +0000
++++ sources/database.h	2013-12-07 12:28:03 +0000
+@@ -64,10 +64,10 @@
+     static Database* s_instance;
+     Database(QObject* parent = 0);
+ 
+-#ifdef WITH_SQL
+-
+     static QString instanceName();
+ 
++#ifdef WITH_SQL
++
+     void migrateTabs_v1_v2();
+     void migrateBookmarks_v1_v2();
+ 
+
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
new file mode 100644
index 000000000000..40dcf6c24c57
--- /dev/null
+++ b/app-text/qpdfview/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qt</herd>
+  <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.13-r1.ebuild b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
new file mode 100644
index 000000000000..cde4684c9090
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ast az bg bs ca cs da de el en_GB eo es eu fi fr gl he hr id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv tr ug uk vi zh_CN"
+inherit eutils l10n multilib qmake-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="http://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 +qt4 qt5 sqlite +svg synctex"
+
+REQUIRED_USE="^^ ( qt4 qt5 )
+	?? ( fitz pdf )"
+
+RDEPEND="cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( app-text/mupdf:0/1.4 )
+	postscript? ( app-text/libspectre )
+	qt4? ( dev-qt/qtcore:4[iconv]
+		dev-qt/qtgui:4
+		dbus? ( dev-qt/qtdbus:4 )
+		pdf? ( app-text/poppler[qt4] )
+		sqlite? ( dev-qt/qtsql:4[sqlite] )
+		svg? ( dev-qt/qtsvg:4 ) )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dbus? ( dev-qt/qtdbus:5 )
+		pdf? ( >=app-text/poppler-0.26.4[qt5] )
+		sqlite? ( dev-qt/qtsql:5[sqlite] )
+		svg? ( dev-qt/qtsvg:5 ) )
+	!svg? ( virtual/freedesktop-icon-theme )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	prepare_locale() {
+		local _lrel
+		use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
+		use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
+		${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "miscellaneous/help_${1}.html" || die "removing extraneous help files 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
+}
+
+src_configure() {
+	local config i
+	for i in cups dbus pdf djvu svg synctex; do
+		if ! use ${i}; then
+			config+=" without_${i}"
+		fi
+	done
+
+	use fitz && config+=" with_fitz"
+	use postscript || config+=" without_ps"
+	use sqlite || config+=" without_sql"
+
+	if use qt4; then
+		eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	else
+		eqmake5 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" qpdfview.pro
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-text/qpdfview/qpdfview-0.4.15.ebuild b/app-text/qpdfview/qpdfview-0.4.15.ebuild
new file mode 100644
index 000000000000..072edd3e3392
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.15.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr id it kk ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+inherit eutils l10n multilib qmake-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="http://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 +qt4 qt5 sqlite +svg synctex"
+
+REQUIRED_USE="^^ ( qt4 qt5 )
+	?? ( fitz pdf )"
+
+RDEPEND="cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	qt4? ( dev-qt/qtcore:4[iconv]
+		dev-qt/qtgui:4
+		dbus? ( dev-qt/qtdbus:4 )
+		pdf? ( app-text/poppler[qt4] )
+		sqlite? ( dev-qt/qtsql:4[sqlite] )
+		svg? ( dev-qt/qtsvg:4 ) )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dbus? ( dev-qt/qtdbus:5 )
+		pdf? ( >=app-text/poppler-0.26.4[qt5] )
+		sqlite? ( dev-qt/qtsql:5[sqlite] )
+		svg? ( dev-qt/qtsvg:5 ) )
+	!svg? ( virtual/freedesktop-icon-theme )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	prepare_locale() {
+		local _lrel
+		use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
+		use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
+		${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "miscellaneous/help_${1}.html" || die "removing extraneous help files 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
+}
+
+src_configure() {
+	local config i
+	for i in cups dbus pdf djvu svg synctex; do
+		if ! use ${i}; then
+			config+=" without_${i}"
+		fi
+	done
+
+	use fitz && config+=" with_fitz"
+	use postscript || config+=" without_ps"
+	use sqlite || config+=" without_sql"
+
+	if use qt4; then
+		eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	else
+		eqmake5 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" qpdfview.pro
+	fi
+}
+
+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..fa32e16027df
--- /dev/null
+++ b/app-text/queequeg/Manifest
@@ -0,0 +1 @@
+DIST queequeg-0.91.tar.gz 69449 SHA256 44e2f2bb8b68d08b7ee95ece24cefeeea8ec6ff9150851922015b73fc8908136 SHA512 e5366577e587fd3f286c917135cd043ef599ef6ee673757f3538668f749ce6a57c2a257f31f1e9d38724cb6ee4680b4401800c23f84ae27deac75392ab6c5e34 WHIRLPOOL 82eef90391ac6933b03e10fef46d5c5500b9dcd9cffccb4e9412ba6c13ee2cb43a2cf9916bf0b32a487f315fe78aec9b3613a678abc7681e9f842fc24f4f7027
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
new file mode 100644
index 000000000000..db1b3ad443af
--- /dev/null
+++ b/app-text/queequeg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<maintainer>
+		<email>hattya@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">queequeg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/queequeg/queequeg-0.91.ebuild b/app-text/queequeg/queequeg-0.91.ebuild
new file mode 100644
index 000000000000..b89272f9f412
--- /dev/null
+++ b/app-text/queequeg/queequeg-0.91.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit python
+
+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=""
+
+DEPEND="app-dicts/wordnet"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r ${PYTHON_ABI} .
+}
+
+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} || die
+}
+
+src_install() {
+	local prefix=$(python_get_sitedir)/${PN}
+
+	insinto ${prefix}
+	doins *.py
+	[[ -f "dict.txt" ]] && doins dict.txt || doins dict.cdb
+
+	exeinto ${prefix}
+	doexe qq
+	dosym ${prefix}/qq /usr/bin/qq
+
+	dodoc README TODO
+	dohtml htdocs/*
+}
+
+pkg_postinst() {
+	python_mod_optimize queequeg
+}
+
+pkg_postrm() {
+	python_mod_cleanup queequeg
+}
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
new file mode 100644
index 000000000000..b54bb63b7cda
--- /dev/null
+++ b/app-text/rarian/Manifest
@@ -0,0 +1 @@
+DIST rarian-0.8.1.tar.gz 459461 SHA256 b410d9581dddfabe93e29f9e235a9f9d04d33d8eb12afd0f5ad3bd238c55adef SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb WHIRLPOOL bd11206a4701e1771ebd5d82123d299c1c3cbb7ecfa6e00654372494d07b8f47cdfc6e88dc8ea6a405acdae0f57b12ae8c927a952f42d55cdab8f1214f0ac237
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..da6fd63d0085
--- /dev/null
+++ b/app-text/rarian/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-text/rarian/rarian-0.8.1-r2.ebuild b/app-text/rarian/rarian-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..7e3b48ca347d
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils libtool
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="http://rarian.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/Releases/${P}.tar.gz"
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libxslt
+	|| ( sys-apps/util-linux app-misc/getopt )"
+DEPEND="${RDEPEND}
+	!<app-text/scrollkeeper-9999"
+
+DOCS=( ChangeLog NEWS README )
+
+src_prepare() {
+	# Fix uri of omf files produced by rarian-sk-preinstall, see bug #302900
+	epatch "${FILESDIR}/${P}-fix-old-doc.patch"
+
+	# remove unneeded line, bug #240564
+	sed "s/ (foreign dist-bzip2 dist-gzip)//" -i configure || die "sed failed"
+
+	# bug #409811, https://bugs.freedesktop.org/show_bug.cgi?id=53264
+	# sed to avoid autoreconf
+	if ! has_version sys-apps/util-linux; then
+		sed -e 's/getopt -/getopt-long -/' \
+			-i util/rarian-sk-update.in || die "sed 2 failed"
+	fi
+
+	elibtoolize ${ELTCONF}
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
new file mode 100644
index 000000000000..c045d7c18db6
--- /dev/null
+++ b/app-text/recode/Manifest
@@ -0,0 +1,2 @@
+DIST recode-3.6.tar.gz 1751886 SHA256 e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b WHIRLPOOL 08eef3eea75d1898800d9f18eec95f50706b4e75285ce22e71723069f7e2a07ee762693c8366e5139add65b319276ced71b6f046884c1e75eb89a3922b7f3dab
+DIST recode_3.6-20.debian.tar.gz 341117 SHA256 ec0e25d91a8d5e4a61e8e2876c338ae6c1ba89018f02ff1ee4eb01cb7c44e7ee SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef WHIRLPOOL 72f00b3d6732b8794456795d847dbb2114c2577b8d5c9683c8fcb41d3bd92548322dc9d73d38af3a4811fb531d9482d1a5d37ee6600cf281bed4ceb6e794b058
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/files/recode-3.6-ppc-macos.diff b/app-text/recode/files/recode-3.6-ppc-macos.diff
new file mode 100644
index 000000000000..c71245d3765f
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-ppc-macos.diff
@@ -0,0 +1,16 @@
+--- recode/src/Makefile.in
++++ recode/src/Makefile.in
+@@ -165,11 +165,11 @@
+ strip-data$U.lo testdump$U.lo ucs$U.lo utf16$U.lo utf7$U.lo utf8$U.lo \
+ varia$U.lo vn$U.lo flat$U.lo html$U.lo lat1ltex$U.lo lat1txte$U.lo \
+ rfc1345$U.lo texinfo$U.lo base64$U.lo dump$U.lo endline$U.lo \
+-permut$U.lo quoted$U.lo
++permut$U.lo quoted$U.lo error.lo xstrdup.lo
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ recode_OBJECTS =  main$U.o freeze$U.o mixed$U.o
+-recode_DEPENDENCIES =  librecode.la ../lib/libreco.a
++recode_DEPENDENCIES =  librecode.la
+ recode_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
new file mode 100644
index 000000000000..f23b9cae1593
--- /dev/null
+++ b/app-text/recode/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+</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..6f8b137d3c6e
--- /dev/null
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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() {
+	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 -f {} + || die
+	rm -f "${ED}"/usr/lib/charset.alias || die
+}
diff --git a/app-text/reed/Manifest b/app-text/reed/Manifest
new file mode 100644
index 000000000000..fc40014b6d16
--- /dev/null
+++ b/app-text/reed/Manifest
@@ -0,0 +1 @@
+DIST reed-5.4.tar.gz 32414 SHA256 226a057aa5db705e83b685207d635d0d3b983999f1e526e0768aa56b0e7c02a8 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7 WHIRLPOOL f603ab7516bb09970ba1bdad52dc5aac7c76ceb61f7b74e3d7adf3eeb8382c7d3ce982b0a48c0b11fad041398a3c5cf7287a1b33e11bdc94aa9032ac045494cf
diff --git a/app-text/reed/metadata.xml b/app-text/reed/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/app-text/reed/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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..1ce31f3505c9
--- /dev/null
+++ b/app-text/reed/reed-5.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..02588ae1ab56
--- /dev/null
+++ b/app-text/refbase/Manifest
@@ -0,0 +1 @@
+DIST refbase-0.9.5.tar.gz 1395726 SHA256 b832ab7f0e8c0ded88c7210d5314be849491ea913b78486898ffb3535b4391eb SHA512 68022eee0c15a4e733a8eef8cd5ca15d6e29a4f3559539657c4a38733a4338b51ef4b716cfd964bdd5eb94dda3c7f012b6e01deb59879f3dbfd79d4d8ce11305 WHIRLPOOL f85609b99182d0fb7d16b39e900d857773136975624b110c6d9a23547682785e416d44797d15f0880b6f342fb30a1474ec362f95b40119202c4454f7168b6b20
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..1dfe25bebf19
--- /dev/null
+++ b/app-text/refbase/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<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..39a921dc10c3
--- /dev/null
+++ b/app-text/refbase/refbase-0.9.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+inherit depend.apache depend.php 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
+need_php
+
+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..e3787eea5ddb
--- /dev/null
+++ b/app-text/referencer/Manifest
@@ -0,0 +1,2 @@
+DIST referencer-1.2.0.tar.gz 675680 SHA256 68731beb242ed2e20c01e7be0e68ce64260dbd3af930c96f8f0eb8e47e88a81d SHA512 4a8a848298c563c775d1fe912b02a82f98a1db92e13865e79c57dda15a6bbc545996080b26f71609cf8965c6c58e827a3ce6f071b3896246e00a6bb073869d9d WHIRLPOOL ffb808616c249266c31191d3c3a88cd20281bf043c7de350599ad5867e406fd08c4418695685291ca8c193cae9cd316ab6cd443719f08850c4e4de2ef5d1ab2c
+DIST referencer-1.2.1.tar.gz 678290 SHA256 449c7ccd6c07770b9a1ff3db4d34eb0ec5a47f6790a80ad1f0f66ea55e5cb4f3 SHA512 16a0af053c7a494f954da373397bf9a5736e1d6c79d041bfeab8f3f2a69952f13fcccd1fcbf49d83afa1521d4f245ee4ac55a1249d6fd7a21394f4926a3bd06e WHIRLPOOL 96975c37a7dc0ae558bfc3954ced2f29e08793259d6443b701af95ba0d58ad58da22e8a81bf90671bcf40ce78dc2fee764095cd4bdde34ad3ea3489b89765409
diff --git a/app-text/referencer/files/referencer-desktop-file-validate.patch b/app-text/referencer/files/referencer-desktop-file-validate.patch
new file mode 100644
index 000000000000..18043c925c1d
--- /dev/null
+++ b/app-text/referencer/files/referencer-desktop-file-validate.patch
@@ -0,0 +1,10 @@
+--- a/data/referencer.desktop.in.in	2012-10-31 17:27:17.609179000 +0100
++++ b/data/referencer.desktop.in.in	2012-10-31 17:47:22.059903251 +0100
+@@ -6,6 +6,6 @@
+ Icon=referencer
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Office;
++Categories=GTK;GNOME;Office;
+ StartupNotify=true
+ MimeType=application/x-referencer;
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
new file mode 100644
index 000000000000..12e9c06e1c49
--- /dev/null
+++ b/app-text/referencer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>dominik.kriegner+gentoo@gmail.com</email>
+		<name>Dominik Kriegner</name>
+	</maintainer>
+	<longdescription lang="en">
+</longdescription>
+	<upstream>
+		<remote-id type="launchpad">referencer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/referencer/referencer-1.2.0.ebuild b/app-text/referencer/referencer-1.2.0.ebuild
new file mode 100644
index 000000000000..579bfa5c6b16
--- /dev/null
+++ b/app-text/referencer/referencer-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_DEPEND="2:2.7"
+
+inherit fdo-mime eutils python
+
+DESCRIPTION="Gnome application to organise documents or references, and to generate BibTeX bibliography 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
+	>=dev-cpp/gtkmm-2.8
+	>=dev-cpp/libglademm-2.6.0
+	>=dev-cpp/gconfmm-2.14.0
+	>=dev-cpp/gtkmm-utils-0.4.1
+	>=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"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare () {
+	epatch "${FILESDIR}/${PN}-desktop-file-validate.patch"
+	python_convert_shebangs -r 2.7 plugins
+}
+
+src_configure() {
+	econf --disable-update-mime-database --enable-python
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/referencer/referencer-1.2.1.ebuild b/app-text/referencer/referencer-1.2.1.ebuild
new file mode 100644
index 000000000000..f39393be512c
--- /dev/null
+++ b/app-text/referencer/referencer-1.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_DEPEND="2:2.7"
+
+inherit fdo-mime eutils python
+
+DESCRIPTION="Gnome application to organise documents or references, and to generate BibTeX bibliography 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"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare () {
+	python_convert_shebangs -r 2.7 plugins
+}
+
+src_configure() {
+	econf --disable-update-mime-database --enable-python
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
new file mode 100644
index 000000000000..bdf6bc51ee55
--- /dev/null
+++ b/app-text/restview/Manifest
@@ -0,0 +1,5 @@
+DIST restview-2.1.1.tar.gz 24948 SHA256 1bf9e845078d05e7cda31bba6fed24a74ffe46f4f466b7b28c39650801724c1f SHA512 c74158d415940c3240b248ec83b1d9c79fa7e279b05a118f04fd5caf6273ef6ba4944a62cf8832e6e214b256962fc559abf42f28a636f4e3140dad9d88fe0cf0 WHIRLPOOL 5986fe67814806eff6c566cb8ba5cd426de984a74740ec50a16790f67029e0d28a33087ec0de1f016461bce725cfbe9921bf8bedef7ffc4603fb9dfcf567c765
+DIST restview-2.2.0.tar.gz 28910 SHA256 1dbb06eaccf6ad4703e1483f3faac583f176b1df34c2f4da488e369c8dcad404 SHA512 c2141232a1ddfa999cd583592dad099176049802c28412a79e9733ed3d372b8ff744d2d4bc3bf1da0f7569dbe8af762913afa8af9fc7b4b4ed0683f2739cef9d WHIRLPOOL 6015dfa7bfa89511647fe8a4725841f962530ca6c986cfea0e69aa68148256307debf60a42187ec5d4e91831c3eaa42f20d830e639cd9ba9cc77f09033d51bc3
+DIST restview-2.2.1.tar.gz 29162 SHA256 da182e03b19850abd1b66bc55addded892acf69602d5fc8eb162de4592e9181c SHA512 d34ad1c62ec15ebd84bf89c6086075e0bda30101f0b6148457c3bdfa8f1928e688e2d557158fe744fcc04d01bdd0ebf9afcabfab821b59f6ebfe9d9d35d2f221 WHIRLPOOL a0d72419e95a3ce0613951a2751478e090674d0e9acb4e3bba161e9d750460c4592a8e3ec8aad64ae701928619f03d32073325b1620b867b8d61c023414e527c
+DIST restview-2.3.0.tar.gz 27315 SHA256 3127fb13b78bdc7e06f85831bd2d64db593dd2154068d45fccac14b064573b54 SHA512 527bafdf6f6ad2e35485ebdee8228723b245615e73af952d4bd5b27beec58fbcddab76b0c855ad1808e53d838e918cc239bc519b0639d1a06c7e0d2249936f9f WHIRLPOOL 34f02a48204a9007e529b8999f1f53ffa63a875cda35dcbd8de9293c29db0cd232e5332bc4372792138c0024ba59735db4062f2dadcafd9ba9b125ebcc5db5d1
+DIST restview-2.4.0.tar.gz 27644 SHA256 52eed1a9ce2bc31d6b4269c8c4ba8c5c1cf7c989b465e9a62bfa6357fc0da965 SHA512 e386b7debb07426733e109d9a77be03443c1621ce727ef982dad572a795dce512b0b89051712009aecefd91e258c304ef936bf2e8dbd15bdb35bdca03913ac07 WHIRLPOOL 51e8f01035096feb31dbc403184276d9427320f26c540779cf635381a6a9a29a4296de8b0745c85fd426752e857bab6ea024eaa6ad6e20faad1d13daa6ee0b74
diff --git a/app-text/restview/metadata.xml b/app-text/restview/metadata.xml
new file mode 100644
index 000000000000..ec83cb0a2b42
--- /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>
+    <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.1.1.ebuild b/app-text/restview/restview-2.1.1.ebuild
new file mode 100644
index 000000000000..8d96eb1f1adb
--- /dev/null
+++ b/app-text/restview/restview-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/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}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/restview/restview-2.2.0.ebuild b/app-text/restview/restview-2.2.0.ebuild
new file mode 100644
index 000000000000..8d96eb1f1adb
--- /dev/null
+++ b/app-text/restview/restview-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/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}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/restview/restview-2.2.1.ebuild b/app-text/restview/restview-2.2.1.ebuild
new file mode 100644
index 000000000000..290c76fdd46a
--- /dev/null
+++ b/app-text/restview/restview-2.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/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}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/restview/restview-2.3.0.ebuild b/app-text/restview/restview-2.3.0.ebuild
new file mode 100644
index 000000000000..68ce224168a3
--- /dev/null
+++ b/app-text/restview/restview-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} 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[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/restview/restview-2.4.0.ebuild b/app-text/restview/restview-2.4.0.ebuild
new file mode 100644
index 000000000000..68ce224168a3
--- /dev/null
+++ b/app-text/restview/restview-2.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} 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[${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..2e80b191e6ce
--- /dev/null
+++ b/app-text/rfcutil/Manifest
@@ -0,0 +1 @@
+DIST rfc-3.2.3.tar.gz 10469 SHA256 894ca3d84bbe354748a4808e60f3d35879637b0fb5a6f9e47a1ece3314231950 SHA512 b16ff2ee0c7a1213369dd4d5d1033c6daf95f283b170ffc46c02b65cd125d4bf2b5dd8b25e8b6a9153330f8fc624454589ecb6d77f2d47e9e34ae18ccbdaf095 WHIRLPOOL ac2e2648f21e6e8aeceef7e2d8e2efe2bddf6cceaf14c87b6f024264cbe04e7ba6a7713103478b45aaba9438dce233d830fae9721c5b408a7a513c27bd53b005
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..ff62877c67ae
--- /dev/null
+++ b/app-text/rfcutil/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>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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..008b0713d5f1
--- /dev/null
+++ b/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f0e9de7174a0
--- /dev/null
+++ b/app-text/rhyme/Manifest
@@ -0,0 +1 @@
+DIST rhyme-0.9.tar.gz 896013 SHA256 11d4862cc3adfc18ea83ca233854c562fcebdc838fa7fb62de6ef3f63f992bd4 SHA512 a769313c4790eae94eca1ecf8c00459b9d74e6437d339f8dc9f6642eea51258a0fc2541877a68eeb3a897c29877b673be17826450c1da5a2352a61266784d0fb WHIRLPOOL a2751ec43dffaa1efa8ad62a29f75c3f69d9558226c321085d583e5abdfb34910bb1a682c0ee9bb3d409cbe324294933188004bd5cb16f51b3ddfcedc3e2e6ac
diff --git a/app-text/rhyme/metadata.xml b/app-text/rhyme/metadata.xml
new file mode 100644
index 000000000000..432aed60b3c8
--- /dev/null
+++ b/app-text/rhyme/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..adce0c1beeaa
--- /dev/null
+++ b/app-text/rhyme/rhyme-0.9-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..57aebfa36594
--- /dev/null
+++ b/app-text/rman/Manifest
@@ -0,0 +1 @@
+DIST rman-3.2.tar.gz 79397 SHA256 68a130696b251966db10a4774e2bc8083a0147b83f64c11e9bb4cd654da32d5f SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae WHIRLPOOL 4ca7685e17a9034eaca12d623c0bb4c9c803d26149e58608b3e45cfc934ebcf0bd4700db01cfbafe6893141b68a4d470d6c9cbee6e18a526f1929902d5e837f5
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..1d0339984462
--- /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>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</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..7e675184546b
--- /dev/null
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan"
+HOMEPAGE="http://sourceforge.net/projects/polyglotman/"
+SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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..afa0a6ae2048
--- /dev/null
+++ b/app-text/rnv/Manifest
@@ -0,0 +1 @@
+DIST rnv-1.7.11.zip 211316 SHA256 39ed53271f20517a55aa74ad5e393dca407e14512a31ecac4c223378bdd4a6ac SHA512 0d9457015e35177144eb88f6d6234e8d94c3a5a45f26f961b4aaba892bf92c0ddcaf0e037cf3fbbeecf110399760e182c20973e6ba32d1223d2f82600582a28e WHIRLPOOL fe82f65b68e55a7f607d7fb0cc200e83e6882c71226095894615822e68d06e20aebb85e80028edd3c5d4881f47779e42a26947d03757c1391ff8a1dc1a5ab175
diff --git a/app-text/rnv/files/rnv-1.7.8-respect-CFLAGS_and_CC.patch b/app-text/rnv/files/rnv-1.7.8-respect-CFLAGS_and_CC.patch
new file mode 100644
index 000000000000..7a06bca630a4
--- /dev/null
+++ b/app-text/rnv/files/rnv-1.7.8-respect-CFLAGS_and_CC.patch
@@ -0,0 +1,29 @@
+--- Makefile.gnu.orig	2006-11-02 09:54:08.000000000 +0100
++++ Makefile.gnu	2008-10-14 01:45:25.000000000 +0200
+@@ -26,7 +26,7 @@
+ WARN=-Wall -Wstrict-prototypes  -Wmissing-prototypes -Wcast-align
+ OPT=-O -g
+ 
+-CFLAGS=${INC} ${DEF} ${WARN} ${OPT}
++CLAGS=${INC} ${DEF} ${WARN} ${OPT} ${CFLAGS}
+ LFLAGS=${OPT} ${LBL}
+ 
+ LIBEXPAT=-lexpat
+@@ -106,6 +106,6 @@
+ .SUFFIXES: .c .o
+ 
+ .c.o:
+-	${CC} ${CFLAGS} -c -o $@ $<
++	${CC} ${CLAGS} -c -o $@ $<
+ 
+ all: rnv arx rvp xsdck test
+
+--- Makefile.gnu.orig	2008-10-27 20:08:38.000000000 +0100
++++ Makefile.gnu	2008-10-27 20:08:56.000000000 +0100
+@@ -1,6 +1,5 @@
+ 
+ VERSION=1.7.8
+-CC=cc
+ 
+ # optional features
+ M_STATIC=0
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
new file mode 100644
index 000000000000..64bd34360c45
--- /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>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>l.valerimanera@gmail.com</email>
+	</maintainer>
+	<maintainer>
+		<email>dma05@web.de</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rnv</remote-id>
+	</upstream>
+</pkgmetadata>
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..42cce74a995a
--- /dev/null
+++ b/app-text/rnv/rnv-1.7.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a6136457fb45
--- /dev/null
+++ b/app-text/robodoc/Manifest
@@ -0,0 +1 @@
+DIST robodoc-4.99.36.tar.gz 280680 SHA256 d38279746204d8862d8436042b089d8c9dffefec6e7f33224f955d82b965a029 SHA512 6643cb1419c58195f26899e629a4a7470014b425e05b7615e523f972b67eb0e39421c373b8c80b53a4dd0d121d61481a7a0e66f7fca7fe82422d56b8ff048b9b WHIRLPOOL cbb3afdf6cd75c8dae47822a2cd9def070557daafb3ea31a138b115ebe3c531990ba50ddd0fd402b7c013dbadf376ac8e7c4c5ea685c41dc781e571bec4ecfa2
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..61697c29edee
--- /dev/null
+++ b/app-text/robodoc/robodoc-4.99.36.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ce1a24d48bae
--- /dev/null
+++ b/app-text/ronn/Manifest
@@ -0,0 +1 @@
+DIST ronn-0.7.3.gem 61440 SHA256 82df6fd4a3aa91734866710d2811a6387e50a7513fc528ce6c7d95ee7ad7f41e SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c WHIRLPOOL 0497ea22ff387f661381a2d0e13cc8d44068e85ec0b90f40cc80f7effa84c3277ee585464547f926aae853c4a88197c1b1b9056edf2da60583c1005bfa942c65
diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml
new file mode 100644
index 000000000000..ae24f128b707
--- /dev/null
+++ b/app-text/ronn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ruby</herd>
+  <upstream>
+    <remote-id type="github">rtomayko/ronn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/ronn/ronn-0.7.3-r2.ebuild b/app-text/ronn/ronn-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..c121215a6e2c
--- /dev/null
+++ b/app-text/ronn/ronn-0.7.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ronn converts simple, human readable textfiles to roff for terminal display, and also to HTML"
+HOMEPAGE="http://github.com/rtomayko/ronn/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/hpricot-0.8.2
+	>=dev-ruby/mustache-0.7.0
+	>=dev-ruby/rdiscount-1.5.8"
+
+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/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
new file mode 100644
index 000000000000..38f0316c801d
--- /dev/null
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ronn converts simple, human readable textfiles to roff for terminal display, and also to HTML"
+HOMEPAGE="http://github.com/rtomayko/ronn/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/hpricot-0.8.2
+	>=dev-ruby/mustache-0.7.0
+	>=dev-ruby/rdiscount-1.5.8"
+
+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..5b6638d9572e
--- /dev/null
+++ b/app-text/rpl/Manifest
@@ -0,0 +1 @@
+DIST rpl-1.5.5.tar.gz 11397 SHA256 4ebb876f1ff4673f34a51caf7f4b722c564dcff8473352174a478418c89c02ac SHA512 f43af366b8fc34b6c4578841f50046170810187119eb0730405a082f64d5c095fd9d28fabf1f0fda1dad85f24e98047df4d695b39b7ea5b99d32efc18634000f WHIRLPOOL 5e5d168a2dff871e1b3464365bbd1d8b74715ed79a32163c009ce5b2898de1e47656b6f7338f5765b794691fe248bf32495c3b0111f4dd30b00584434ecaad7a
diff --git a/app-text/rpl/files/rpl-1.4.0-gcc4.patch b/app-text/rpl/files/rpl-1.4.0-gcc4.patch
new file mode 100644
index 000000000000..6cfb8c62627d
--- /dev/null
+++ b/app-text/rpl/files/rpl-1.4.0-gcc4.patch
@@ -0,0 +1,19 @@
+diff -Naur rpl-1.4.0-clean/src/replace.h rpl-1.4.0/src/replace.h
+--- rpl-1.4.0-clean/src/replace.h	2002-07-24 10:41:45.000000000 -0500
++++ rpl-1.4.0/src/replace.h	2006-02-19 16:38:32.000000000 -0500
+@@ -77,7 +77,7 @@
+ 
+ /* This is a simple macro to call malloc() and die if it returns null */
+ #define MALLOC_FAIL_STRING   ("\n" PACKAGE " Unable to allocate memory!")
+-#define MALLOC_AND_CHECK( x, y )       (void*)(x)=malloc((y));if(x==NULL){fprintf(stderr,"\n%s --> %s:%d\n", MALLOC_FAIL_STRING, __FILE__, __LINE__ );exit(EX_OSERR);}
++#define MALLOC_AND_CHECK( x, y )       (x)=malloc((y));if(x==NULL){fprintf(stderr,"\n%s --> %s:%d\n", MALLOC_FAIL_STRING, __FILE__, __LINE__ );exit(EX_OSERR);}
+ 	
+ 
+ /*  Function Prototypes */
+@@ -90,4 +90,4 @@
+ 
+ static void EchoFeedback(int, int, int, char*);
+ 
+-static void SetPerms(struct stat, int, int, char*, int* );
+\ No newline at end of file
++static void SetPerms(struct stat, int, int, char*, int* );
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
new file mode 100644
index 000000000000..6a90974eb087
--- /dev/null
+++ b/app-text/rpl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>shell-tools</herd>
+	<upstream>
+		<remote-id type="sourceforge">rpl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rpl/rpl-1.5.5.ebuild b/app-text/rpl/rpl-1.5.5.ebuild
new file mode 100644
index 000000000000..25d42834e2f8
--- /dev/null
+++ b/app-text/rpl/rpl-1.5.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+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=""
+
+src_install() {
+	distutils_src_install
+	doman ${PN}.1 || die
+}
diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest
new file mode 100644
index 000000000000..4de1fd00e18f
--- /dev/null
+++ b/app-text/rtf2html/Manifest
@@ -0,0 +1 @@
+DIST rtf2html-0.2.0.tar.bz2 75292 SHA256 13d39bdd3387aeba1e640d3209aa2ce56871291247734757d399675e4b8b918b SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75 WHIRLPOOL 077eb9d7fec11796e4a1c4257bd6380621a3c112bb9faab0e1090a8419b96c49e2bf7fced42bd5568408fa497d691f61a99eb538c35c1409d9ee703d7654397d
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..fdb7d4cec9d9
--- /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>
+		<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..3199bdae8125
--- /dev/null
+++ b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7ac1bdb252a9
--- /dev/null
+++ b/app-text/sablotron/Manifest
@@ -0,0 +1 @@
+DIST Sablot-1.0.3.tar.gz 607597 SHA256 a0c737ada78d0d305a2a964595167e0c6d17ff0afd3b801714768deb681bf362 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031 WHIRLPOOL 4422053971238feebb798a22d5d82581f1f62e361cfd4bf5eff38ed7d87dffb6d9093a56dc3b992674987025de3fdec107d0c7de9138ceeabaab3281fb84ae83
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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
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..fb65a2ef0fcf
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..dc4b98d945eb
--- /dev/null
+++ b/app-text/sary/Manifest
@@ -0,0 +1 @@
+DIST sary-1.2.0.tar.gz 393787 SHA256 d4b16e32c97a253b546922d2926c8600383352f0af0d95e2938b6d846dfc6a11 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632 WHIRLPOOL 0a63d5a507da154588228e18c777eaca251888b7b67342c31775d6f1d8b0c9f877b2e79be473807ab08dc4d9cb87779cac3bdd8290a64333b3507b65583ac7d2
diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
new file mode 100644
index 000000000000..47b74cfd91c6
--- /dev/null
+++ b/app-text/sary/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+<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>
+</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..097ea4fb730e
--- /dev/null
+++ b/app-text/sary/sary-1.2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..6c5d6bc1813e
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -0,0 +1 @@
+DIST scrollkeeper-omf.dtd 11031 SHA256 43df758009b17f8487419ef1fe3039379370417385885a2578e1789ab092ae26 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0 WHIRLPOOL a99c168e3645c2f7bf497d3e38ff3b98b5334246d87cbb3d12e9b15e72e7ea420db60ff553c49d45f5a380cd8a0a813269e08af20767f365bbaa9796b392d5eb
diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
new file mode 100644
index 000000000000..48a8d9232864
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+</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..f4599fdff214
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~x86-interix ~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/metadata.xml b/app-text/scrollkeeper/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-text/scrollkeeper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</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..6c29c255a7e1
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Dummy scrollkeeper for testing rarian"
+HOMEPAGE="http://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 ~x86-interix ~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..88c46f67bdae
--- /dev/null
+++ b/app-text/sdcv/Manifest
@@ -0,0 +1,2 @@
+DIST sdcv-0.4.2.tar.bz2 181384 SHA256 a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2 SHA512 0c701a64893c7531006617e190924e292bd755c2a4c3905fa7ab44002bf189b5d2c7694f331356093a3b5e9f690f89e50bca29b9c36a9fb9733603d2aef1b58b WHIRLPOOL e605ee39a38e405ddae1b438a6714b5f9bc684097fe264f4bd124955a2f05c39e4c3140fb22526ca5dee51f61803740321d6c4143212b6450c17bf507e869a6c
+DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 SHA256 386cfc96285a653c697f8baeab676cb3f1645cea029464d194872d0bbae14ffb SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570 WHIRLPOOL 0e9cb7eaf6ccee6f9c7dbebbfee4d4a80c1cdca7444f2ba6f276a670924395dcdabd4ee7efe929bd940f3b3accc01e425f0270c2d7c897bcbd4adc03fd566a05
diff --git a/app-text/sdcv/files/sdcv-0.4.2-crash.patch b/app-text/sdcv/files/sdcv-0.4.2-crash.patch
new file mode 100644
index 000000000000..264cffcf1fca
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-crash.patch
@@ -0,0 +1,27 @@
+Fix unalligned access to buffer.
+
+On several architectures (arm, armel, sparc and ia64), unalligned access to
+integers is not allowed. Buffer in this function is not alligned at all and
+attempt to read integer from it causes crash of application on such
+architectures.
+
+Reported upstream at:
+https://sourceforge.net/tracker/index.php?func=detail&aid=2149388&group_id=122858&atid=694730
+--- a/src/lib/lib.cpp
++++ b/src/lib/lib.cpp
+@@ -496,9 +496,13 @@
+ 		entries[i].keystr=p;
+ 		len=strlen(p);
+ 		p+=len+1;
+-		entries[i].off=g_ntohl(*reinterpret_cast<guint32 *>(p));
++        /*
++         * Can not use typecasting here, because *data does not have
++         * to be alligned and unalligned access fails on some architectures.
++         */
++		entries[i].off=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
+ 		p+=sizeof(guint32);
+-		entries[i].size=g_ntohl(*reinterpret_cast<guint32 *>(p));
++		entries[i].size=((unsigned char)p[0] << 24) | ((unsigned char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
+ 		p+=sizeof(guint32);
+ 	}
+ }
diff --git a/app-text/sdcv/files/sdcv-0.4.2-dash.patch b/app-text/sdcv/files/sdcv-0.4.2-dash.patch
new file mode 100644
index 000000000000..35d15ae014c7
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-dash.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/t_datadir b/tests/t_datadir
+index 116ae7e..327e5b5 100755
+--- a/tests/t_datadir
++++ b/tests/t_datadir
+@@ -1 +1 @@
+-#!/bin/sh
++#!/bin/bash
+diff --git a/tests/t_list b/tests/t_list
+index 42ae137..62e52fd 100755
+--- a/tests/t_list
++++ b/tests/t_list
+@@ -1 +1 @@
+-#!/bin/sh
++#!/bin/bash
+diff --git a/tests/t_utf8input b/tests/t_utf8input
+index 7ae88c4..e692ab0 100755
+--- a/tests/t_utf8input
++++ b/tests/t_utf8input
+@@ -1 +1 @@
+-#!/bin/sh
++#!/bin/bash
diff --git a/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch b/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
new file mode 100644
index 000000000000..72fb690358ed
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
@@ -0,0 +1,21 @@
+https://sourceforge.net/tracker/index.php?func=detail&aid=2125962&group_id=122858&atid=694730
+
+Fixes displaying of 'g' (gtk markup) entries.
+--- a/src/libwrapper.cpp
++++ b/src/libwrapper.cpp
+@@ -118,7 +118,6 @@
+ 		switch (*p++) {
+ 		case 'm':
+ 		case 'l': //need more work...
+-		case 'g':
+ 			sec_size = strlen(p);
+ 			if (sec_size) {
+ 				res+="\n";
+@@ -128,6 +127,7 @@
+ 			}
+ 			sec_size++;
+ 			break;
++		case 'g':
+ 		case 'x':
+ 			sec_size = strlen(p);
+ 			if (sec_size) {
diff --git a/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
new file mode 100644
index 000000000000..8c96c65fa93b
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
@@ -0,0 +1,47 @@
+diff -ur sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp
+--- sdcv-0.4.2-orig/src/lib/lib.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/lib/lib.cpp	2009-07-25 17:39:11.000000000 -0400
+@@ -517,7 +517,7 @@
+ {
+ 	fseek(idxfile, wordoffset[page_idx], SEEK_SET);
+ 	guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
+-	fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
++	fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
+ 	return wordentry_buf;
+ }
+ 
+diff -ur sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp
+--- sdcv-0.4.2-orig/src/libwrapper.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/libwrapper.cpp	2009-07-25 17:39:11.000000000 -0400
+@@ -24,6 +24,7 @@
+ 
+ #include <glib/gi18n.h>
+ #include <map>
++#include <cstring>
+ 
+ #include "utils.hpp"
+ 
+diff -ur sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp
+--- sdcv-0.4.2-orig/src/readline.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/readline.cpp	2009-07-25 17:39:11.000000000 -0400
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <cstdio>
++#include <cstdlib>
+ #ifdef WITH_READLINE
+ #  include <readline/readline.h>
+ #  include <readline/history.h>
+diff -ur sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp
+--- sdcv-0.4.2-orig/src/utils.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/utils.cpp	2009-07-25 17:44:17.000000000 -0400
+@@ -22,6 +22,8 @@
+ #  include "config.h"
+ #endif
+ 
++#include <cstdio>
++#include <cstdlib>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+Only in sdcv-0.4.2/src: utils.o
diff --git a/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch b/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch
new file mode 100644
index 000000000000..5b616500c6ce
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch
@@ -0,0 +1,17 @@
+=== modified file 'src/sdcv.cpp'
+--- src/sdcv.cpp	2008-11-18 12:43:28 +0000
++++ src/sdcv.cpp	2008-11-18 12:43:41 +0000
+@@ -161,7 +161,11 @@
+ 
+ 	strlist_t dicts_dir_list;
+ 
+-	dicts_dir_list.push_back(std::string(g_get_home_dir())+G_DIR_SEPARATOR+
++	const char *homedir = g_getenv ("HOME");
++	if (!homedir)
++		homedir = g_get_home_dir ();
++
++	dicts_dir_list.push_back(std::string(homedir)+G_DIR_SEPARATOR+
+ 				 ".stardict"+G_DIR_SEPARATOR+"dic");
+ 	dicts_dir_list.push_back(data_dir);   
+ 
+
diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
new file mode 100644
index 000000000000..26d67044fd65
--- /dev/null
+++ b/app-text/sdcv/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>sdcv - console version of StarDict program.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sdcv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/sdcv/sdcv-0.4.2.ebuild b/app-text/sdcv/sdcv-0.4.2.ebuild
new file mode 100644
index 000000000000..45b48062efe7
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="http://sdcv.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls test"
+
+RDEPEND="sys-libs/zlib
+	sys-libs/readline
+	>=dev-libs/glib-2.6.1"
+DEPEND="${RDEPEND}
+	test? ( app-dicts/stardict-quick-ru-en )
+	nls? ( >=sys-devel/gettext-0.14.1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-missing-headers.patch"
+	epatch "${FILESDIR}/${P}-crash.patch"
+	epatch "${FILESDIR}/${P}-g-handling.patch"
+	epatch "${FILESDIR}/${P}-respect-HOME.patch"
+	epatch "${FILESDIR}"/${P}-dash.patch
+}
+
+src_compile() {
+	econf $(use_enable nls)
+	emake || die "emake failed"
+}
+
+src_test() {
+	export HOME=${T}
+	mkdir -p "${HOME}/.stardict/dic"
+	emake check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
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..75f8e2f78b33
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..18e0d947cc55
--- /dev/null
+++ b/app-text/searchmonkey/Manifest
@@ -0,0 +1,2 @@
+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
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.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..97f46cbd3df3
--- /dev/null
+++ b/app-text/searchmonkey/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..4d146cb08cb8
--- /dev/null
+++ b/app-text/searchmonkey/searchmonkey-0.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
new file mode 100644
index 000000000000..9bf17458ddd1
--- /dev/null
+++ b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/"
+SRC_URI="mirror://sourceforge/project/${PN}/${MY_PN^}/${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 )
+
+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..c0df298f9bcc
--- /dev/null
+++ b/app-text/sgml-common/Manifest
@@ -0,0 +1 @@
+DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772
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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..d9bf54221bde
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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..c935022b7e38
--- /dev/null
+++ b/app-text/sgmltools-lite/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
new file mode 100644
index 000000000000..0d6cac1cb4e2
--- /dev/null
+++ b/app-text/sgmltools-lite/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..d59d588eafb5
--- /dev/null
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..094cbd0c2c4b
--- /dev/null
+++ b/app-text/sgrep/Manifest
@@ -0,0 +1 @@
+DIST sgrep-1.94a.tar.gz 193267 SHA256 d5b16478e3ab44735e24283d2d895d2c9c80139c95228df3bdb2ac446395faf9 SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a WHIRLPOOL bc39aab9c39e5ffdb64babd8de5819eff6665f430ff51644e6789d6f0fe721407104fbc877719cb7b24f7424c514e0284e3ae7bc728e21ef68c8606b9c2f52f9
diff --git a/app-text/sgrep/metadata.xml b/app-text/sgrep/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..f9295d74506b
--- /dev/null
+++ b/app-text/sgrep/sgrep-1.94a.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter text streams"
+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..556133edd9fc
--- /dev/null
+++ b/app-text/sigil/Manifest
@@ -0,0 +1,2 @@
+DIST sigil-0.8.5.tar.gz 19394323 SHA256 12540493685988a2a3a3898675b8c92c422fbec43513bdd935b802fc68ca40f4 SHA512 fd4d65afe5afe97522727681963c08483b9ab78070fed2e13c987a45d5f8b9885d7a55c721d25213c097016bd1c375369f1ebedc079329bd995955e6d75d2d06 WHIRLPOOL 0026e04e9f304186a5f6c6d7756cdb30c004e0da4f969d89c19dfa1a475dfe29a85058c82d4066089111778d83c411d520bced0ce19e8fd94b80f0a1a5608ad6
+DIST sigil-0.8.6.tar.gz 19394568 SHA256 5f89b47abbf0a7befa4e776083db5426456f8ef1ef50bd168dc98d621fb2ad26 SHA512 5d45ca43520f6fd13e83c97da24d613a05e9b33dd0e07637f872a0fb6050f345f9228a8f63d1e81ee727f07d6dbdf306d55fdb51d0ac67dde33327465c3c6732 WHIRLPOOL 99388aef513842b930c4f549fdfa23414366a9af390850fa982dd3ef53d59ab4bd443001929bb50d83699ed4f960104f8f96452744a9acb5f08416843dcbe960
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
new file mode 100644
index 000000000000..384cf8e3576d
--- /dev/null
+++ b/app-text/sigil/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>tomboy64@sina.cn</email>
+		<description>Maintainer, assign bugs to him</description>
+	</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="google-code">sigil</remote-id>
+		<remote-id type="github">user-none/Sigil</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/sigil/sigil-0.8.5.ebuild b/app-text/sigil/sigil-0.8.5.ebuild
new file mode 100644
index 000000000000..f830538b4738
--- /dev/null
+++ b/app-text/sigil/sigil-0.8.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="3.0"
+CMAKE_BUILD_TYPE="Release"
+
+# This ebuild could use some python checks, as sigil contains python plugin architecture.
+
+inherit eutils 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/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.7[minizip]
+	>=dev-libs/libpcre-8.31[pcre16]
+	>=dev-libs/boost-1.49[threads]
+	>=app-text/hunspell-1.3.2
+	>=dev-libs/xerces-c-3.1.1[icu]
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxml-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+"
+DEPEND="${RDEPEND}
+	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.8.6.ebuild b/app-text/sigil/sigil-0.8.6.ebuild
new file mode 100644
index 000000000000..f830538b4738
--- /dev/null
+++ b/app-text/sigil/sigil-0.8.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CMAKE_MIN_VERSION="3.0"
+CMAKE_BUILD_TYPE="Release"
+
+# This ebuild could use some python checks, as sigil contains python plugin architecture.
+
+inherit eutils 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/user-none/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.7[minizip]
+	>=dev-libs/libpcre-8.31[pcre16]
+	>=dev-libs/boost-1.49[threads]
+	>=app-text/hunspell-1.3.2
+	>=dev-libs/xerces-c-3.1.1[icu]
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxml-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+"
+DEPEND="${RDEPEND}
+	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/silvercity/Manifest b/app-text/silvercity/Manifest
new file mode 100644
index 000000000000..97871abaa9af
--- /dev/null
+++ b/app-text/silvercity/Manifest
@@ -0,0 +1 @@
+DIST SilverCity-0.9.7.tar.gz 278396 SHA256 5b226e71d75c0afc4434c6fbfb44214e8728fd69703045b2134802f71ef049bd SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0 WHIRLPOOL 2a45f0952adf8542d04aef0111dfc926b5019108d739a168d591f8bd57c3064b7d6bc5f05a9d00d7939c42a935ec0d4b80fa14ca34107fee26dfcd8613ce6b2b
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
new file mode 100644
index 000000000000..cd6ea64ec5c6
--- /dev/null
+++ b/app-text/silvercity/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+	<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..50f2d720d10e
--- /dev/null
+++ b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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/silvercity/silvercity-0.9.7.ebuild b/app-text/silvercity/silvercity-0.9.7.ebuild
new file mode 100644
index 000000000000..e30b72322ece
--- /dev/null
+++ b/app-text/silvercity/silvercity-0.9.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/source2html.py")
+
+PYTHON_MODNAME="${MY_PN}"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# 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"
+}
diff --git a/app-text/skribe/Manifest b/app-text/skribe/Manifest
new file mode 100644
index 000000000000..029b9e4cef21
--- /dev/null
+++ b/app-text/skribe/Manifest
@@ -0,0 +1 @@
+DIST skribe1.2l.tar.gz 245007 SHA256 87bc31b7c087070f27be2be816b322993972bbf03fb72cbd0d7603796d5636d0 SHA512 159d824d0f1935b04a6b180b8484fba7f32d3d7579c86aafae681b4f988cc4e765795844828321235f5c6104242d0d2c5a2d4c908ff05b23d26bf74ed6ee14c5 WHIRLPOOL 4bea508c5f86669ae1cabc722b46c56273a647a75839ccf8d815daeb1e30a94584add1d191632fe555e8ba4e5deb18e59abbee1a3503c36e93db9d27053d2491
diff --git a/app-text/skribe/metadata.xml b/app-text/skribe/metadata.xml
new file mode 100644
index 000000000000..e2d37ebf02db
--- /dev/null
+++ b/app-text/skribe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>scheme</herd>
+<longdescription lang="en">
+	Skribe is a text processor. Even if it is a general purpose tool, it best
+	suits the writing of technical documents such as web pages or technical
+	reports, API documentations, etc. 
+</longdescription>
+</pkgmetadata>
+
diff --git a/app-text/skribe/skribe-1.2l.ebuild b/app-text/skribe/skribe-1.2l.ebuild
new file mode 100644
index 000000000000..c50d79e1810d
--- /dev/null
+++ b/app-text/skribe/skribe-1.2l.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Skribe is a text processor for technical documents written in scheme"
+HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Skribe/"
+SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Skribe/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-scheme/bigloo"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# falsify bigloo auto-strip feature to prevent pre-stripped QA errors
+	sed -r 's/^blinkflags="(.*)"$/blinkflags="\1 -eval '\''(set! *strip* \\#f)'\''"/gi' \
+		-i ./etc/bigloo/configure || die "sed failed"
+}
+
+src_configure() {
+	./configure \
+		--with-bigloo \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}
diff --git a/app-text/sloccount/Manifest b/app-text/sloccount/Manifest
new file mode 100644
index 000000000000..ef632ae3ab4a
--- /dev/null
+++ b/app-text/sloccount/Manifest
@@ -0,0 +1 @@
+DIST sloccount-2.26.tar.gz 190948 SHA256 fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b SHA512 ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63c0973c33eb7fa634b4ade0a1f3c6ccfd5172ea95f648c1dd3b0ae2575b0aa44b3fec708c24a6aca54 WHIRLPOOL dd809909e10601ec733a7e5426183553c00c2cd25164db2d9085c975f689209067c206094caa84ef5085fc27a7188509fced271928e2d28ccb5a6b0749f7cd77
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..c6d862855eb5
--- /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>
+  <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..78cad89a8030
--- /dev/null
+++ b/app-text/sloccount/sloccount-2.26-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/runscript:
+	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..822f921c8900
--- /dev/null
+++ b/app-text/spellutils/Manifest
@@ -0,0 +1 @@
+DIST spellutils-0.7.tar.bz2 110421 SHA256 0d5723321b6d60f31a93a43708904b2fddfcff3ec2fdd30e13214c64dd28e875 SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e WHIRLPOOL eae95485f51ef7bede2076c60a7b2aa3f36b57723bb30aadc8fd863aded939f0529e18e656cc18cdb614945657ccecbb4ebf5580aa598974edaf2485ac71a709
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..d9cd2cad66c2
--- /dev/null
+++ b/app-text/spellutils/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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..7909181c3805
--- /dev/null
+++ b/app-text/spellutils/spellutils-0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c8cbd9eb24b4
--- /dev/null
+++ b/app-text/stardict/Manifest
@@ -0,0 +1,4 @@
+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.4.tar.bz2 8961622 SHA256 c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8 SHA512 a1cbf58202b5430b0869955bfb7df961debab12abf55022f7c07537246c81dc182c3be50fa66273c13c289471c15afba74d15933cb202ae292f4388aa2fb6fd5 WHIRLPOOL b0476e5f38862e4c2a747206a8f1d8c55dc889d1138961390aa9f415ec310cabce242e7a4f484a4c260a004e3a8a152726cf936f0ec030586ddcd91979912aa0
+DIST stardict-3.0.6.tar.bz2 9341740 SHA256 6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7 SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658 WHIRLPOOL 9502af310d5eba5ed23457fff9e9f00e2d8453873cece3c20e2c5daf861bd665fc7b9c8e292be5b1d886f9a9fd0d5ad9bd1d8fbd043d221e6637c1c8185f444f
diff --git a/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
new file mode 100644
index 000000000000..6a320bd4a9f2
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/401887
+
+diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp
+index 16770a3..a4299e7 100644
+--- a/lib/src/libcommon.cpp
++++ b/lib/src/libcommon.cpp
+@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name)
+ 		return EXIT_FAILURE;
+ 	}
+ 	while(true) {
+-		len = gzread(get_impl(in), buf, buffer_size);
++		len = gzread((gzFile)get_impl(in), buf, buffer_size);
+ 		if(len < 0) {
+ 			g_critical(read_file_err, arch_file_name, "");
+ 			return EXIT_FAILURE;
+@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path)
+ 		return res;
+ 	}
+ }
++
++int gzclose_compat(void * file)
++{
++    return gzclose ((gzFile)file);
++}
+diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h
+index 10f13b4..bdcbf2f 100644
+--- a/lib/src/libcommon.h
++++ b/lib/src/libcommon.h
+@@ -187,8 +187,9 @@ namespace clib {
+ 	typedef ResourceWrapper<FILE, FILE*, int, fclose> File;
+ }
+ 
++extern int gzclose_compat(void * file);
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
new file mode 100644
index 000000000000..14dea7b29227
--- /dev/null
+++ b/app-text/stardict/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</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="espeak">Enable text to speech synthesizer using espeak
+			 engine</flag>
+		<flag name="gucharmap">Enable gucharmap dictionary plugin</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 the extra stardict tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">stardict-4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/stardict/stardict-3.0.4.ebuild b/app-text/stardict/stardict-3.0.4.ebuild
new file mode 100644
index 000000000000..aebeeead7f68
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# 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.
+
+# NOTE: Festival plugin crashes, bug 188684. Disable for now.
+
+GNOME2_LA_PUNT=yes
+GCONF_DEBUG=no
+
+inherit eutils gnome2
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://code.google.com/p/stardict-3/"
+SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
+	pronounce? ( http://${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 ppc ppc64 sparc x86"
+IUSE="espeak gnome gucharmap qqwry pronounce spell tools"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	dev-libs/libsigc++:2
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.20:2
+	gnome? (
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/gconf-2
+		>=gnome-base/orbit-2
+		)
+	gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/libpcre
+		dev-libs/libxml2
+		virtual/mysql
+		)"
+RDEPEND="${COMMON_DEPEND}
+	espeak? ( >=app-accessibility/espeak-1.29 )"
+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"
+
+src_prepare() {
+	# These 2 fixes have been upstreamized for upcoming 3.0.5 differently, so drop 'em:
+	epatch "${FILESDIR}"/${PN}-3.0.3-zlib-1.2.5.2.patch
+	sed -i -e '/DEP_MODULES/s:glib-2.0:gmodule-2.0 &:' dict/configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable tools) \
+		--disable-scrollkeeper \
+		$(use_enable spell) \
+		$(use_enable gucharmap) \
+		--disable-festival \
+		$(use_enable espeak) \
+		$(use_enable qqwry) \
+		--disable-updateinfo \
+		$(use_enable gnome gnome-support) \
+		--disable-gpe-support \
+		--disable-schemas-install
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
+
+	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
+	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 ${PN}-text2bin
+			${PN}-bin2text ${PN}-repair"
+
+		for app in ${apps}; do
+			newbin tools/src/${app} ${PN}_${app}
+		done
+	fi
+}
+
+pkg_postinst() {
+	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
+	elog "  emerge -s ${PN}-"
+
+	gnome2_pkg_postinst
+}
diff --git a/app-text/stardict/stardict-3.0.6.ebuild b/app-text/stardict/stardict-3.0.6.ebuild
new file mode 100644
index 000000000000..8f0f5cb21510
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# 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.
+
+# NOTE: Festival plugin crashes, bug 188684. Disable for now.
+
+GNOME2_LA_PUNT=yes
+GCONF_DEBUG=no
+
+inherit eutils gnome2
+
+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? ( http://${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="espeak gucharmap qqwry pronounce spell tools"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16:2=
+	dev-libs/libsigc++:2=
+	sys-libs/zlib:=
+	>=x11-libs/gtk+-2.20:2=
+	gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/libpcre:=
+		dev-libs/libxml2:=
+		virtual/mysql
+		)"
+RDEPEND="${COMMON_DEPEND}
+	espeak? ( >=app-accessibility/espeak-1.29 )"
+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"
+
+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
+	gnome2_src_configure \
+		$(use_enable tools) \
+		--disable-scrollkeeper \
+		$(use_enable spell) \
+		$(use_enable gucharmap) \
+		--disable-festival \
+		$(use_enable espeak) \
+		$(use_enable qqwry) \
+		--disable-updateinfo \
+		--disable-gnome-support \
+		--disable-gpe-support \
+		--disable-schemas-install
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
+
+	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
+	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"
+
+		for app in ${apps}; do
+			newbin tools/src/${app} ${PN}_${app}
+		done
+	fi
+}
+
+pkg_postinst() {
+	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
+	elog "  emerge -s ${PN}-"
+
+	gnome2_pkg_postinst
+}
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
new file mode 100644
index 000000000000..fa2785e61cc3
--- /dev/null
+++ b/app-text/sword-modules/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>theology</herd>
+<maintainer>
+  <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..5e1962ba26f0
--- /dev/null
+++ b/app-text/sword-modules/sword-modules-1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b8141c67aa45
--- /dev/null
+++ b/app-text/sword/Manifest
@@ -0,0 +1,3 @@
+DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
+DIST sword-1.7.2.tar.gz 2127944 SHA256 ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe WHIRLPOOL 894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0
+DIST sword-1.7.3.tar.gz 2149459 SHA256 5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a WHIRLPOOL a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
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/metadata.xml b/app-text/sword/metadata.xml
new file mode 100644
index 000000000000..212f74428c43
--- /dev/null
+++ b/app-text/sword/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>theology</herd>
+<maintainer>
+  <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.6.2.ebuild b/app-text/sword/sword-1.6.2.ebuild
new file mode 100644
index 000000000000..d56179b6c1c0
--- /dev/null
+++ b/app-text/sword/sword-1.6.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}"/${P}-gcc47.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/sword/sword-1.7.2.ebuild b/app-text/sword/sword-1.7.2.ebuild
new file mode 100644
index 000000000000..07ab6f0d9dab
--- /dev/null
+++ b/app-text/sword/sword-1.7.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+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/sword/sword-1.7.3.ebuild b/app-text/sword/sword-1.7.3.ebuild
new file mode 100644
index 000000000000..07ab6f0d9dab
--- /dev/null
+++ b/app-text/sword/sword-1.7.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+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..cfb9614de571
--- /dev/null
+++ b/app-text/t1utils/Manifest
@@ -0,0 +1 @@
+DIST t1utils-1.39.tar.gz 175047 SHA256 0faef3e5c4927b38b05ac99ee177b7d7cddbbf5b4452f98b244f684b52b0d4c4 SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301 WHIRLPOOL 976452434ea273cc1a42973cec28cd7587925490e37369715eeebb5e1d4aebca829d61893060512d621fe9393dd3758d670f0e1827347d8240cb622aa7afa1be
diff --git a/app-text/t1utils/metadata.xml b/app-text/t1utils/metadata.xml
new file mode 100644
index 000000000000..8c5d39f263d0
--- /dev/null
+++ b/app-text/t1utils/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</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..0435be71799b
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.39.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/tabler/Manifest b/app-text/tabler/Manifest
new file mode 100644
index 000000000000..0bcf05d0855d
--- /dev/null
+++ b/app-text/tabler/Manifest
@@ -0,0 +1 @@
+DIST tabler-2.tar.gz 87706 SHA256 681e15e245db8869ea7ed21177adb93e8734a8076acde0f5b015fb8994761c9a SHA512 6f01796b4cadae22f9ae0029ee8a7bb224d04faae1793b13c9d8473e6a902543a5bd6da86e806f9c50c8b39ad7f5d44525c2a701920cd6c62c27995409d0b1d8 WHIRLPOOL cfb8d4c9e6ce3460a05f9b923b5e3017417b572ba49aa3d37cb02e1d0f4061556f4346e56caa0b9080cd4f85cd0ff74081ac4097f4b2922a0a4b9e45051d34a8
diff --git a/app-text/tabler/metadata.xml b/app-text/tabler/metadata.xml
new file mode 100644
index 000000000000..6995d7e9c41c
--- /dev/null
+++ b/app-text/tabler/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tabler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/tabler/tabler-2.ebuild b/app-text/tabler/tabler-2.ebuild
new file mode 100644
index 000000000000..4e3862d3f5df
--- /dev/null
+++ b/app-text/tabler/tabler-2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A utility to create text art tables from delimited input"
+HOMEPAGE="http://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..900718f5a24e
--- /dev/null
+++ b/app-text/talkfilters/Manifest
@@ -0,0 +1 @@
+DIST talkfilters-2.3.8.tar.gz 821338 SHA256 4681e71170af06c6bffcd4e454eff67224cde06f0d678d26dc72da45f02ecca6 SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28 WHIRLPOOL 81a7ec75d4a71794675b52da0feaf729048082fb7531c06fedb5ad8e3beb8e8e198d071ecac479cd54cb06123b0245e3614abcdf27d26b7a5eaaebeb179d5a0c
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..371398706167
--- /dev/null
+++ b/app-text/talkfilters/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <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..020316629bb4
--- /dev/null
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped or otherwise humorous 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/talkfilters/talkfilters-2.3.8.ebuild b/app-text/talkfilters/talkfilters-2.3.8.ebuild
new file mode 100644
index 000000000000..31e67a02e1c1
--- /dev/null
+++ b/app-text/talkfilters/talkfilters-2.3.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped or otherwise humorous 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=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README || die
+}
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
new file mode 100644
index 000000000000..ac2e338ed710
--- /dev/null
+++ b/app-text/teckit/Manifest
@@ -0,0 +1,2 @@
+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
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..ba6a8a8800d5
--- /dev/null
+++ b/app-text/teckit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..8abefdeb1e40
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..300bda9b0712
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/tesseract/Manifest b/app-text/tesseract/Manifest
new file mode 100644
index 000000000000..1a130969847b
--- /dev/null
+++ b/app-text/tesseract/Manifest
@@ -0,0 +1,101 @@
+DIST 3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
+DIST ara.traineddata-3.04.00 6315068 SHA256 21c98aaf7aeba2271ac0cc4a363d364d806649d7cb0bcab85d4b9a385f49645a SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b WHIRLPOOL d258d6eecb01feca9f0de5c973ab4a3c952db764b624ba98732e58af18a88332daa746e19194bcee8ed6fe1abe2a8d42b0b8976f0c9bde66e9831482b389f038
+DIST bul.traineddata-3.04.00 6026234 SHA256 ca0bd253b4ab6202db5e8b2cecbc4219b4f725e51468cabf5bc99338e2c3de33 SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c WHIRLPOOL 1bc19032224a6d4f94aae67fd8f5caabbcc00c00b0329513bf23c7a978f01269edec965e6090564b345862dc8810c2bc9c6fd04c736b7f4180998dd0cb8cb8fa
+DIST bul.traineddata.gz 848731 SHA256 fc3c650568d014f2337052658e9ddd8efaff6ac74c9a90952d740eafdf400e2d SHA512 69dca9b285da3985142fc3e8d2a75d7fb217308c077114004c274972491c8cd8aebd60e27ffb26c9906a6ae78e05e19bbc5fd24ab97b961df5882cbd295f747a WHIRLPOOL a331336952140946bae38c59f9005d131dc9f7976358ff06a4458311ac0e5e10102868d0c37a41eae3f73a27d6a9a253c599e53167dbdf6c7c086ba8418f0624
+DIST cat.traineddata-3.04.00 5356190 SHA256 29af67467ec1b1ffd4d2d9748f0219f2220974b0e53a66ec7234f1768b43fc4d SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630 WHIRLPOOL 94b50ede6a958d9c0c8128296a1dc9d2d3a7ce148f6a42603e8c95c4e968e69f0007a457744ca539854e6470f8eab9faa009f1ddd8b9bd266215a44307fad0b6
+DIST cat.traineddata.gz 995008 SHA256 dcc52db7522c67d2629117b7fde4c114ca51677f7f1efbedc12bf1e7319acde2 SHA512 603286de44dba701b53a0e4e7c9ba7e4e871bbadbc582f644417246ceb58155f826555fd8f53b58dca48cfa96633509cdde3cab6c0c5d3b43f5998d231ed54bb WHIRLPOOL efa6696ecc48d1bda4ff6efc01b5230cdf3cdb57e13f9b6b2adc9b50798e38b30fce0f9595d61f23e144c7b5c36301beb1de4c0753492213d7be8f447b33acbe
+DIST ces.traineddata-3.04.00 11896327 SHA256 60c58ecd97875a41eccae4846a2e4bf74cb0e4bc066d1bc430919c76a19fb37f SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d WHIRLPOOL 2d906496e63304ee7e094ed69dcd1d97253e9802f16e338652c1550c4ae7812be4cc7bef6ac75fe1efb182f59bafafe61d3fd5ee54f37c0e1c65c85bf96614cf
+DIST ces.traineddata.gz 1059966 SHA256 9848a4c137be45659e29f4aa07ccb6357fd4401307478cce0ed5f8e6686480d2 SHA512 5dba38364a423bdced1ef8edcb0d05adc02d5b4db77f31e31df571d75430e88a6b3d1d3c0ed43dac71c444bd716799e2d7346aa2d6baca788d27707f327d6fb8 WHIRLPOOL 1bfe54cbd9a8085f8a34018abf26d9e6b0ae650d5378db4fad27bd3b5d27af6662171db6417422d13a57416d2a22e37c21078e131283952a73964c5e445c57e3
+DIST chi_sim.traineddata-3.04.00 42089623 SHA256 323ae74d4a2ff49e932dbb4d6282fe0e67ddfafda075ec85803ecd077207454c SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673 WHIRLPOOL 40b202dce49c25bac2f684189581567ac97ab5dbf00eeb6a06a00272856f5f0f0de22c2025e1b57e122af58af7edeba83cad28ef10a698e53c5ff5e598357526
+DIST chi_sim.traineddata.gz 19732398 SHA256 40c1cdf62106a0705807e8be5bee235a9e9efe716e22568e3885561a835d7d5b SHA512 a5eba7a9a96756286e7d069df4cb3969ca70cfe43350d5300499d8cbef2b0d967d858604e4f35c485a517483b1fbc446080837bf9f6833fad2bc91adfd92b8cc WHIRLPOOL 2fa505c09a6affb1ee26f8154324d77e3002b4c1f874a11a423336be0f8b1e17dbae3037d8efeb17046c53d9c62a1cda7af94473933b39382cc72cc3dc4d5fd7
+DIST chi_tra.traineddata-3.04.00 56692327 SHA256 774d566bd0b36e4b6c07415dfa5b6b57feb2575b1f5f231d7fe01a52dac5dd0e SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1 WHIRLPOOL 3c8dfd8658a6b81d594a73c6da4d8e8223a38d15328938d92a8ee5e1afc50671476daa4f525b403f727ec8773b895f783ed3c1c68bb8c068fd1c7d2715708ed2
+DIST chi_tra.traineddata.gz 27512772 SHA256 68ac2d83998b7f6e3fa26a58be8be5507e78185a16b3e106fe48a7b2667165fc SHA512 1b06e4523072a3e4005d22b439ce6c70c176bc36b593a95ec6569436521520157b9cac0e3f2c6e4e63a0359fceeba3ce38d321c0cf114bd1a845224ccee03ab2 WHIRLPOOL 980c9eb089ca6eec293167138376555a67e99c119cd93aa1fcff996f41556c1328fc83c249e7473c125bcb03398a65adeddf09c0a6b73ded823d7aa5aecaf20e
+DIST chr.traineddata-3.04.00 1083194 SHA256 8bb20f8a78e31a4802fa9f1e075cb7de8d7c2eac5b7b33942a6d82abe0783acc SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455 WHIRLPOOL e5cf1c4156589eb9d1d5e290e03b5b87d9165608da3df2587621f5b876c65e1dbd2c290c7b6f2400853e8d46e54e2805248d9363172363d52000c4ce11fabf14
+DIST chr.traineddata.gz 310053 SHA256 a24bc34149f83ddf28f7dce43224024f9a20aca971f10e834aaf3339b9ec34ce SHA512 61eba3df0486dbfd05d028ff41e8fb30de7a14b1983c936e71f2845368584a4542770e9a2aded94af5e252609fb52e8a4b271f12e732b7941987975067702e01 WHIRLPOOL 1bd344b60fb497c3a40c91b77bb74ac60754fe0ec58bf54666776e600599caea75cac11e8182b37d83289bf54f699fa9f4cfd43998300ddfdd2e7126313eeda9
+DIST dan-frak.traineddata.gz 683525 SHA256 ddc9f75b6104618d0682c9c98f5fed1ec52b1b0d5a54d38a20b20f0ab5d9a32b SHA512 38fe5469b4378b82fa1be18716664bec4736de6607560bdea260100d51c5c1e789254fd3884616e4bd0f2a4c7eebdd12c81dc9719aa0eac11aa4bf8b5c16d93c WHIRLPOOL b21777eafe0cdae6081e765632607e1b607d0899cda22baaedfc8386bf0bb693f4992e3e88fef9b0bafa600aabbef9cba3b07af647dc8e69b37af5165ec5aee7
+DIST dan.traineddata-3.04.00 7340575 SHA256 f9521a8381ab1823be0808f933a9bb8f1172968a44e391e370b1fe9b4d913ee8 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff WHIRLPOOL 3aed0bdc2613b5b2b98b2860a629e49a186a8eb28ae3ec958f212bbb939d263aac0a326ab4c870ba01ee6564e83faf9fc0e7849955d596954b1e761d9d76805d
+DIST dan.traineddata.gz 958449 SHA256 2104d8b1cfde6fa960e31db826a101a356c77c3efeae6e78cab5a97e62f3410c SHA512 21807212521c970c15ca02ce81e95cf97d22f0e8abdcf40c299ffa61ac32970409c83ded7e3d99291f0bdd5f9f63f92109e7d119f70d4e22daf599d96780ac2a WHIRLPOOL d08773c5da32c5e8eb67184883be05c5efa00613e9c5b9a39dcb79f7e338c7e29af6fee01d1749cb707b269f8021e2ae580844840f926255f38f38042cace73d
+DIST dan_frak.traineddata-3.04.00 1622710 SHA256 7183617a7ba763f59c1ed87ebc8b4885da03a9bba2b99d4600afac58fd28b1af SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01 WHIRLPOOL 629500189e28509d17fb6bad33a443c5f9a79126403e2132d63ad9a28516b8364462b5e7ee346eb95b3af357fe805a739f3e28d2e84b3f787d419156d3b9234f
+DIST deu-frak.traineddata.gz 827836 SHA256 59f005f735a33039d416f699bff0bae7d42e5ab000dca6e1aae99d99f3776dc5 SHA512 41ab3a1b9fe506fa50f75e86c8e8f58ef4935d9f92379a0327d9e970094e306faf77d643b7bb45f84acd9c2972b26775d76fc7399249c6778dc33947b4e0c4db WHIRLPOOL 317a0bc2b16ce7bfc000ae1ef5de05a16ba47111c3198175245a32c64bb80525a861cda669ad8fdd7c4280ba8c490f3ee805985c16ba7bf7f357944e1e638d05
+DIST deu.traineddata-3.04.00 13367187 SHA256 cb7eb42a7e972cec7ef904fe81825d7b547c46df684c814fdb11a930b13bca3a SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995 WHIRLPOOL 554ebb795842f3086750ad55e826e57d0725e60c831ed7be213d73e80efce734983f53c1ace9d91776b865b7cfeb745554f5eb6f9bcaf3138be4fdca6c27898c
+DIST deu.traineddata.gz 965684 SHA256 9e1845a69d5b6cf93d4fa05d5b8934e7cfaf8b088e6be9e8dac30c7859591ccc SHA512 a0c717b9fd9d438761fa195d8348d30ddfe6db088b2d1c29b9779d5b77002b12f1229dccade7bb992c40bc911e1aba8ce1e960f2ba8a8518a1a3bfd6be22a97e WHIRLPOOL 43f3113f5154264a9f89b31e671b77979f728ebb83c10f95568537d201b887ed9872973a785f76e74b00007e0a1c3be39c26a6762131f0a3e47e15ab9b1f71f4
+DIST deu_frak.traineddata-3.04.00 1978593 SHA256 cbb200e394485c5b515de203963c2a76c14bdef2cf258219ecf2bcacf6cc93f8 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7 WHIRLPOOL 87e9d1645d01f5f6418516649b96274ad587b7d584eec72501d2435398038e5f57f5e910086636b51eb80bd666598a3af61a447a8bdf5a1cedcf7a8a0304a390
+DIST ell.traineddata-3.04.00 5422512 SHA256 bbe0ed0758c69043114b13fc8f00a42342c647f27be352c05b4978e265380e64 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48 WHIRLPOOL 16d89cb546883bf75a8b75e55c0eb88d915d07cad0f4c5b3e0640385f4b7cb2a6aeeedce13cf48538f5a78ec39776ccdecef9c3264cd749e1d224cdcff5e310a
+DIST ell.traineddata.gz 944284 SHA256 f8cb765c40733a677fa470370b935c34cfc53ba8de372b33e83ab59c7407195d SHA512 3657cc335e9e484f13ba360518cd3d9bf828a1c0e53a22c84a4085565ebbca0811b8d2a25edd2455c9b6707baa54896d132bcfdad210384b3025ae26506d7582 WHIRLPOOL 634e00d9f1d2d2cc67053efce2b937f7a1201b719ba902744e96ccbc72f682b7374dfa56f050956db39f5a191d1ed41e12d90e01bc87d406070acc0598aa9f71
+DIST eng.traineddata-3.04.00 21876550 SHA256 c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a WHIRLPOOL e71cec7e7e8b9b8183f459741ce2eb1a33923e73802ab35dae81ab7939b980b028e4d4a3325205a52f67b8502323e9cd8dee6efd69ca40c0eb42b0961d5d8786
+DIST fin.traineddata-3.04.00 13274908 SHA256 f830c625f635a637cb11a6a565126b1ae105c24ae9fd7cb92c8d5130c7184cf1 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789 WHIRLPOOL 9068bd4b23ac62d8b4cc846b10abb7bf536b786a8eefc32745ca99370eb6739b4ee9bd912b78cb0922e6111a0e8be2dc58285c0726dd2ebd92bb3349bf8344db
+DIST fin.traineddata.gz 959833 SHA256 30c05d403295fb659048b5d82db0d87c9cbee5077314e2b52f6fdca9c9ec8520 SHA512 f7db41a5698ce51f8f103201f7dda67cf140a57d28da7bf3420847c60f847bc24c16571d63785b707e9d599017a0a29ab15914c4b413e4e9dd12b019643e9682 WHIRLPOOL 2adbe34d45050331ae3f7d7ba9739dd0dafb600cccd2713f38aa79bc83023898cf97e45c63b9edbb5014f5cffa02596be6ec75b34e45fda5d87f19bc9418db78
+DIST fra.traineddata-3.04.00 14044118 SHA256 86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561 WHIRLPOOL edd6121dbfb52ca11ce86fcf54ec5f026d6b4341f824fbe1eab45af2e830bf1cf80615626b260c79343337fb61181e69b42281da78e6784dc28d244afd09a1fb
+DIST fra.traineddata.gz 933372 SHA256 1d795f1da1ee20671ffbbf4b2997b424f459861b217c9ffa7abbeb72abd760d6 SHA512 d6fccbcbe2c953af8e6928e344caeb14e5967fe921230629910cc13501ac589c2adb6d1f74bf93a2cbd83331d02f552277c5578ebe82b6e2551b392be9aca4ad WHIRLPOOL 78d5992777de78497c032dd82d8e2f184d647df2c4f27e50b70cb6657db0de2653c99249ed000e8bb3fb398fa72993e7333ed9da2c13db5bc6502231d2d56f6f
+DIST heb.traineddata-3.04.00 4339016 SHA256 4f79288afde9162ee27841f0de999e690022cf1e3bd1723e34ca8f189c4bea9b SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727 WHIRLPOOL d9fc11c9fb6a87fa4f0f1e03b63fa3e8a33dfb8f32b66b127172bc1acf835943505985f856c49d183a028b5fab66d7c691ac66f6ed3f10199bae3d7f669058b9
+DIST hin.traineddata-3.04.00 14152165 SHA256 6e99459dbdcc40bfec132747bc233054916bed9da02f89567c9388c32e2fd6ee SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed WHIRLPOOL ceee2a21820c0d77a788e2f303e6d128a8cca71443887ad7b922b0079a120e2b0bada1d4cc6d54030ab4105093d11042be9597219a4ccf31ce2860bb58a31b48
+DIST hun.traineddata-3.04.00 12213770 SHA256 a6704d2e8dae62240597342c33736cd7bd836a88e188fc74db038ec87be3ffa7 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e WHIRLPOOL f475ff06bc43215b9f9817da4a7958167e273bc25259655682bcffa81ce96e2944efe8909502b47ff73eead791af65356179685f4d38e7c8671f03a5883dc054
+DIST hun.traineddata.gz 1008061 SHA256 7b4d80703067fc5a8bf3da80f7da699f26a665a3e5ca93004fe353a1d6e74f60 SHA512 16db595f2c1e2659cc7ed91b2583d16ed0b901d4929ac66130f2fddcc357678a6390fe429c8300267691199bb9b75261eaa2a5f54ae57a4cfd27a977bee1d179 WHIRLPOOL dbe6f7ab30261c7625ad7939979874e26d5195345b9df77627c930838c2259aae982274161a54e6da511f9654f9f25dbdb257c77ff1a682e98319cabcd8aeb6b
+DIST ind.traineddata-3.04.00 6503178 SHA256 3738deb007baf9f01b3a601835003f71c314d1b955f8a743634f6f1ec8220d88 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77 WHIRLPOOL a564f9fb7b481f95466e5d65d8e02326df629932a52125b277ed11479d1145f911cf5941666b18cc8ce7325806a902c4ed0b5cb613cbc41859088c21b4142867
+DIST ind.traineddata.gz 836752 SHA256 9b2ee5ab2d33511f5fb8edbaee3d3a448cf8ab9efbf8e5c852d59481317e8218 SHA512 a62db1d18376d0e3e78e3a9c71f2341fd5b452bdf23beb1f85c59acf8a722944818f09fabca9d8f34c04e0bb348cdb369cb33d59639a72a3a7ba645d72f98097 WHIRLPOOL 0b0e0f0460b83e3ee8aa9c394ab017550adbf4016fc7d843bba303262e1fa847a188987af2bb503f965eb96a4f4957b95b054a58b519a9f5e3b26a137d129370
+DIST ita.traineddata-3.04.00 14210569 SHA256 5a4e6e826e021d04f3494c2bd74ed1af5977b67fdedceb3c9aa30ff6c7a4b3d3 SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef WHIRLPOOL 3e2714679db204426e1997bce5ad8616fc0413523768f9e962ea73b1272041a2c7c88210600627d079be2ce41f09f16f67c0d431e899042181199bf924b08a26
+DIST ita.traineddata.gz 939956 SHA256 a6cbaa39fddee521090e48d6a83b6f62e77b5fe7d90ab8ce9ee4d8ada10730f5 SHA512 4486eec1d7ad839e6b266edc8dd2fc31875c3c3cdc59da8b3d690ec5a20f59787d557ea85474db8c5fd30c6a990f5a8a2c9eddfa1defe0687e85f81b10366296 WHIRLPOOL 7811e79d1214608808b4f3316a61e42d6aa499f0a7e74609b502d2eaede5164d7ec4c1f787f128a2af70697641844875f6a8e18b4aa85ee227001597405d2c63
+DIST jpn.traineddata-3.04.00 33072615 SHA256 3c3c957cbbfb6fe66b38b46bc17f86158dfdb1688a2a28ede7ee0ec891f4aaf2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567 WHIRLPOOL 67bcc22f05f19f196b8349e73659d2f5c3b41fa1a4a73dcf824d058675037b96ae23873aba99d084a8409abba6d75548b4f1dc0f83ff38fdf29d1826fe2a9978
+DIST jpn.traineddata.gz 14604738 SHA256 ebbde8c607a05cdd97d492734896a24b2aa17d5b4fb00e9597a96b39c1f22aa3 SHA512 33b48c49353460382d317c100f61ca269632b1c9d51360d17f40b73406ccdbf7a1b754a237fac8e6eb230046e153b07926fa203ded6c62c4996d1a18abbe2290 WHIRLPOOL 832f6841e3b4688f663ba68f084472dd26430562b78af6c81ed0ee7fac843a94e614aa3bbb1106348bec803b6f3f3ea7860e73e0c0b9bdffd86647c63d5d9776
+DIST kor.traineddata-3.04.00 13309831 SHA256 fb312ebe119a7673ca68c0a9f7b9ddd13a704f64609dd22f2fd606889c918de6 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee WHIRLPOOL b8adca986f62de6149f7b9710ea71f29de61af5aab7010b1de2621e4b5b546289a11a176192cb86d4ab3b2fc55df76837fd70c37fa2c3659da527bdc10d7d7a5
+DIST kor.traineddata.gz 6032090 SHA256 8d4709341dbda7da9f42bb1d39c4d22d5ca767c2a30fbe36cb2ad152f092b01f SHA512 9caa876d74328752284310d26b586e496ac42814c876f2c71163274209e7ea6c5e64a0af803ae072719639ccedd7d4ffc5abf2c30503a26db8793dd512bd9fc9 WHIRLPOOL c922c004d36983b80290f1cd47930843dd29aa17a8c99501a1eb7c2266fb8e2058b6a3d1c5f98b3602aeca1e7cf9a7efdbaf17575f74915320d1e755bc6990a4
+DIST lav.traineddata-3.04.00 7802105 SHA256 4f1f06376f498d0dae11fb03200ee124c615dc848fee1c05aff9187bf8f6bf3b SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b WHIRLPOOL c1f2c9a22f98d5c44f8da541baa48f02b7137eddecabd04a81ad889b1a0088f1d97e4115376824b780e8bb5dd15ffbe9302339112d93919703e65d139975923f
+DIST lav.traineddata.gz 1018176 SHA256 305173b54d836dae2f22e4f488734440a83e683636c033cafe066083738ceebc SHA512 65d8179a2c0cb2cdd7c143e683119b0839269d9a7e91cf435aa674338a8f140b305023df15cf378eee1d2657421c0532196a80ac09e01b5978adc9673ccfeaec WHIRLPOOL cee07649f0ce1e36fa57c39877542176441b30bbcd854ce6d4726a2a8695e8fbf5fcd9355911b55c06fc0b512c1d29537a41ab81baad8d3690f4451948b0ef18
+DIST lit.traineddata-3.04.00 8916163 SHA256 158a5277572f04bb9fb070a3bc00ad3a5fe7a5e25856c9f92489662ce57b0038 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0 WHIRLPOOL 969355747616e5b7d5657db26b2c1efec3ac8b06c2c63d00e9dcbd876a7fc8da207d6c579e0179f0083aae134e23f24be5ba64ca7a54e0015c9f130bd3b20bed
+DIST lit.traineddata.gz 1012936 SHA256 1a04f9e952a76d430c2b9d16140f2d42f27c72a9bbd55b3e8f2b6e701ef0f399 SHA512 c442b21b79b1aff6308939df0d309a007581965a3d743c8b52845447329cf6f569555ce5a6b09c62d0b1a98803ff8192bde8ea002039bca01f45726840b287db WHIRLPOOL 7e38c4652a2f6f468c00a84ba81a37d0106fa90c71016cbb9cef897df84a3eedaf4e585be93945c8f9bb7f6da0137c441404152fe117fb8716fb132ce5ce1f90
+DIST nld.traineddata-3.04.00 17098919 SHA256 bd849345e8476f47b40c17204fef5cf64287244c19b9d17e297ffe70fc5c9cb2 SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c WHIRLPOOL 508f0107b19862e50606c86240a48c13336ca28816acde8a697b2ed28ceb621e72f629a97fc4d551d4dc6e9a9c69e3f2269f629ceb687063405c61894565e3b3
+DIST nld.traineddata.gz 954151 SHA256 2826628b0ff22fc3bb5d6e9d6901a39141b805b78084e0c9ab61f12c28747831 SHA512 5881747b1d6ba2b696b5a69222ed738013373084ab5b2611e286a75e266dc6c3009d4bfe5108e02556008ad41259354ef8ce1e9bbf4d7f4cb3a827dbd1aab0e9 WHIRLPOOL 53098c6a1713ca58d0805b5a06c5a6b004fb31cd386b55df1230da3213e7bd66329fabf2a2358753594bb114fa66170b503b1aa3ad2b24d7f940bee7a8e4d177
+DIST nor.traineddata-3.04.00 8262167 SHA256 a990269f3d815ad206ea0f27b14d07e7a0be0c171335397bc0b46ea0cdcfdbfa SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2 WHIRLPOOL 3d609ed7c818f0c2329ee2521c5bf75165f9be317ad7d50d12aa77333f3e069f4ffdda904b3c632b01b921c3aa6778b08d8e955935e12e28815ed0f666adcc17
+DIST nor.traineddata.gz 951018 SHA256 c97cbfd93f676b331296b729d5526d1accc1325474a6b6d91260d03a1c862606 SHA512 bfc6e61c89875ebaee394316960f3912e17645e862bee839a8ad59f1b920f7f09ad4471a6ce70ef5dcc9918dc651da62841efeaf103906b1d79fe227c9058304 WHIRLPOOL dd5e27bcd5140dd869283f31f133e9530e8d56ba69292016ddc2b154be2f5235463cb3c31c602c5d1c97cc12d7f6164f98bfd9cda7f1253979eab55ace530b88
+DIST osd.traineddata-3.04.00 10562727 SHA256 9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f WHIRLPOOL 909efcb63ee6eebb9b5b28eb05548aed669e21081f708e51e705da42f06e8694a7fa5338a1e5af27269f8145cac7031ad730238472747234062b2f18ef2fc1be
+DIST pol.traineddata-3.04.00 13918058 SHA256 1d2292319d2e3c65e15f19f55b961c9b492651fc179f3bcd219affe7c141bf94 SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10 WHIRLPOOL 2feae8c53b76358a4c51b4760e86015f313cef22fcfe137863ee7d0ba2baf802d1de929e763e22297d6c3b5328f2eac5bc42aa65b39f558bcc9ba8b51422fbb6
+DIST pol.traineddata.gz 1060352 SHA256 708e2c59cc4e6451e90fc1ef57b83b809bc354b9e0ef3935e9f181d2a718d5ce SHA512 5bc230736cb31a016be02aa8f2b5eadec1ede759251fc900d497694eb7217233f6b3ccdb6e42b3ca208e8bec0870c1ca1ad9f8782911b29dee412bcaca826457 WHIRLPOOL c5bc439c3faa8f871e2d1b5ccc08d6240cd7d856c464873cf54953826023fb428073e16277e6307685ea7ea4a374168d487f1c94d6c61e5a8cc70fac2747ebf8
+DIST por.traineddata-3.04.00 12914622 SHA256 089fb419cd7bd135236244dd9a4b8a42dfe2ee97d97b481efdd7b92c9c6324a0 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03 WHIRLPOOL f7142c9e86cbbeefa10ed8375518f3adb61ecf6dcd0c8ca55c6b54d57ac279bf9efa56ea92ef05c38a14168f4344ae82058556b948bf516bbac2a0886e01453b
+DIST por.traineddata.gz 911645 SHA256 25df33e4f6c55749d04a5307f1143e31a71a76b7417b91a531c686bf49308b85 SHA512 398f2b305cd7cdcfdc519974b5c0902016d19ab924bb93d64cb3e2aaf6268795904e996ae0014c9532f336dbed8f694137a130dda75de3257373089ad06aebe5 WHIRLPOOL beeb5bc13dbb6a1d4da1333c6c12f151770fc5fad7953893861de166684348d95a21542a7e35156d6862108b30f7f5034c94a7a2cb88038da49bea6c323ca2e2
+DIST ron.traineddata-3.04.00 7957608 SHA256 f4f3614d4b009eeb0ab5815ebef080ebba7c470b3f80c9f97ed6da0d3f409986 SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a WHIRLPOOL 3257cad73ef2f12b91518942669463728a31bfdfe9db4e604411ec02edba4933c047ba6df9eac65f46436e5f5242fd58ee3070d59b9b140f3b8c3fe19a74bd43
+DIST ron.traineddata.gz 929925 SHA256 367ccb440283e57e4e3f87cd0b97a59a07ceb920e09da8778feafe5e086a9892 SHA512 11cb77120be1fc5e0640e572b77ba7fcd5f3f2c37159e41bb955930256d2fd7f2a14f1000b7bac103125ad7cabc772f90ca7f7f9bd8a735228c9d5ddafdb9153 WHIRLPOOL bf8aecb72ff31bd359a55e47b66a09c222ebb88c5734353132f676417e54c693354ad0f4d0c1ab376b559bb715dd7ead5a5d9b98437aef103f834e8e27357111
+DIST rus.traineddata-3.04.00 16152507 SHA256 1800dcaf043e95007269f07168a12258cd8b87bf413769c2b5a3d5451e45cab4 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335 WHIRLPOOL a2d14ba6ab87b681bb95d60527677268ec7ffeaac59fd6a240fdce023fc5e2f2377f3250a7a393c14221f43f8c3ea7e7a93dc83b9fec3e7bd37d1fcb0a53f658
+DIST rus.traineddata.gz 848490 SHA256 8ced9431d2b1d544fbdd362c36786e3804451da06093bc45acecad84829e5f7a SHA512 c86879e8128aa036aa79209885777feab1e5c519657a6087460896dcd55ca19d3a7cf6e5407a0a0bb62bab74a5f52283643650a636cee4b669537589efa4c933 WHIRLPOOL 65b37f8b16e385640ae0bced917cfbbe3fad241403385e2d139b942afba1932919414d8db7d2cca5c8b3711afe890e21660a000bda274d1927aa32f5c74f9f9a
+DIST slk.traineddata-3.04.00 9126966 SHA256 ba5d2aba09f59e1952583825dd7b0eb9ba706283d1c0f93be8d7381b5e5eae2f SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96 WHIRLPOOL 133a028dbea660377922a7df3690b3218b1e68735c6b9a19b2eb5d6e142a5d50e1a24d245f81a593c7baf14e7ac76536dd0c218033ef2e4e72f620a5f67b9a6f
+DIST slk.traineddata.gz 1091624 SHA256 037839ad756b9177f7d8f7bd3f01a3a1012094360c5c62a49abbde0a33389511 SHA512 57e3caf86d778252d3a408394489ea27d6faec488aef77120db6bfa22f4ca1c926b64cace1492f8c78e9f696b71dec901ac37dae7ffae2e6f82a0ff3e7c8d9fe WHIRLPOOL 4f4d4d664609da7d008eb76ba6dfb248f35d08b340948ebd79c5ce6b9db57271aab9ae4433534ab6e140c3aa97629c42e9037de8986cfa80e12ed50a33bf0b95
+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.gz 930221 SHA256 bb7318f24972abc380688c67be86d07193e0294b252b60c648720978ad4a8b04 SHA512 a5592afbf935f4ab011099c7ca50064cfe0d7da9110503678922253841fec2afa37d7d836e248639b6d831a7951aed3cea89f3afc62dc21ea723f422a7c7140f WHIRLPOOL 9c8440cb1308f39894436c48f80889a5f0b5ba6c94dd90acfbcc577f477860ccd2ed240e1f00fbfe5efdac9b1e2fc1112a0c17c7e19436ff0021f3b539a91bfb
+DIST spa.traineddata-3.04.00 15953087 SHA256 f23985996bbcfe2b57864ccb082783c1c74c87429f04411a04a6ba4d3da2efda SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8 WHIRLPOOL 3be9607b1041aac3e744165e7767b32acd91e9746c7b35bb052dfb94f5a4391d19fa8da9122164c01d3f2d39224960a6ce83c431acfeb5e9c391ff1d4b816ba1
+DIST spa.traineddata.gz 910992 SHA256 5de0748b068f35c941e86bba622e23a376a6b084cb094007e7059714f1e030e0 SHA512 489c1b57206c34bdb0632461ff786d5cead8507e1b18daa8cb01ccb12aab63fd7084ba65d6701b4f82abc7c71d4ce734a94fac66983a49fc5a42d1801a7aa246 WHIRLPOOL da4bc245279e5009d49c9bf45e9a5d49cc75e8a725c550c07eab4ca3f90ba880984d9f0973d41da217f0a4ebb636541afe966a9497b934dd321f2b9a219d99bc
+DIST srp.traineddata-3.04.00 4611681 SHA256 35bfeb3ce14f5afeb82c9be2490db34178c0e13f7de8061013a083b163c67415 SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a WHIRLPOOL 5a10a60970f8bfd5dd5245b2da20861d4b1107d31f1c81531cd7f77030015e75dfa820c3fd4e824865a2f89e8f5254137ff533b7c80e00a27cc3d90a94aecc44
+DIST srp.traineddata.gz 977674 SHA256 542b83f62389ff8cc34746dd765345566ab368b63dcf275c223ecb52c2cb9291 SHA512 8a0abd8b00f91bd17bb58962a137160ed6b2a785eacfb562788cff822f54f027987d020a1e73f203687a8657747d11292af0a05b4397f673453ea335e8ea1806 WHIRLPOOL b39c80695ee0444e4427267ad3ca00dad50f28a499ca17eefa3e91436351a4a6d2c539eaed18bae760f174662c4d89b65f5bb43d09a662654172ea850904ed33
+DIST swe-frak.traineddata.gz 1503568 SHA256 2cf1a0e1eb8a0e3f8477ebcde44d99a9229f2c20b2d96ecb1ca6c25db5c6fdec SHA512 ad23fb3b4088a6e3c706ac54c940399b502d1e5e0a822f671e7e0682709323380eba6ae2e6a138702393450fea9ec3473c977d5bd9aa7550081a8c0aaeb3ae58 WHIRLPOOL b8e217a419cab817424f977a5a3650587afc91d9ddc5a929f89568c60930f61bd219305b36d7f84a9b07aae489e1f896f8e300fa474c098de03f03df92b8b2f7
+DIST swe.traineddata-3.04.00 9460295 SHA256 2a6407bbf187eb1fcfd1633fae9abffcd6220e7ab74e05e65bf16426ac8f2050 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167 WHIRLPOOL c95f12b64b1563d195b38cd8ad169f91e7608ba72c2e93fb49aebd7ec6bd065431b8ee892621cdd7d01922b99e71f52d1f1e5023b3af682eb2125419f0d529cd
+DIST swe.traineddata.gz 959911 SHA256 25331ca1f41378a86336604476049810a0c5350417205e300cb2d11048cec2c1 SHA512 e38fe9fd7d26420ee1aab3db7f700d58210dbfaef45d03114679d2671bc1942d7b031499e763204e15ebeadafa2f8f063f78941f2299b2c74f635425ddce856a WHIRLPOOL db1225d47e2e3b26372689f96164d8286701dbb2e0f1a82368c784c8d127a0d11248924936abd05d0092ba8ad5ce222b6d113ceb0f440b85faaca37396781480
+DIST tesseract-2.00.deu.tar.gz 1373777 SHA256 6083f16373689ef55651f4dd7773426ab4c32a12ebf7f398af982ac2971fe404 SHA512 e1792055d666c6090c4094b032d0143fd6bd5545c2d2e926f71bb360c6628ae5550f158df8efe47b69c987ac9cef8bd914fedcad2bd5b79901a41506ad8a60f2 WHIRLPOOL 77322db4454bddffa9f7b08bf8336ecddb0a71be9b7463427a7aa87e49716dc1aea4c8bb85ad836716bba03519827c051229a5cc37149d96558cdfe83ffc3445
+DIST tesseract-2.00.eng.tar.gz 1013090 SHA256 2fbd50a6cb352f847ebf3deadc914bbc12592539d4c368f7f7cff0a71f7d48e7 SHA512 f2aa2e1aa8f20c59faa664675f85ca8c1dcc922803f17cc00519f84a01c0c98ba431915ba5765d5de75200d828687507846af7e9e0096f3a4fdf1163e54cb83d WHIRLPOOL 178baaa6c73169a8b3e9276927bcf67bdd80fe114c8c3635aacd765cf9198dce2599c4f5493577b2ba9b1538ca8da69e6b2117fc7c9bb6451c129ee2efb71efe
+DIST tesseract-2.00.fra.tar.gz 1007776 SHA256 1201229bb8b377ab3d92255e0b0642a36304b99415091fb059f423c814cecd25 SHA512 46686d6296446c59d020731e2d36e015717a750f6a41401c38794e7e8067dbd0299b838260a9ea9d5da3ddc289e0320ed71437f67ea99f93e79895e4aaf9cdc8 WHIRLPOOL 9cb290cf260c40272223c75f1b575361cea2d51f462a10f4f82e20518531cbe1b908473b4d6a11f08c7461c4fbc8bd31256555964d39502676b035dc753da97a
+DIST tesseract-2.00.ita.tar.gz 977683 SHA256 3a1b9323ddfcda327780aba94ef724f35690d3cfdf8ef832c5709721b7e2999a SHA512 75cb670c1fe202878c220029d113e0795844f94901a6a0e31201c43d5694e1995c11760229ef6dc5222ff1fe49ee87ee1cdf073e80347e2862e71f045ce4a2db WHIRLPOOL c57ad7d994abc0c030ba68efff6c27eca8af9c78878f166d0fdad6564f916b6c30c1882c7447ce38752817489054bbed71ec49b07de70d1cf5e96080646fba2e
+DIST tesseract-2.00.nld.tar.gz 1408071 SHA256 26b9f7d80c4cfe19074c3c5dc55a37b489d89b6f7b13c026f9c2dc265120d859 SHA512 0a2b7f13d784d210f5284de1a02c9b3849c4b36a27cf6276b5d9d444607bf52b909f8edfa07b5b1e0ee6bf59504bb9c92a47297ce31efa351aaa6b81c038b0ef WHIRLPOOL 5c60260832af157cf4f07b79105187be6a1f9d5bd2bf4d8d0a0c8f43c36da3271225114e6d5d1e1b83e53e47bf67e0e8ec89ed0f22ba6c48c620c0c22da854d2
+DIST tesseract-2.00.spa.tar.gz 1365863 SHA256 b4b83e46be4602a361279c131da2c7f3ba8c51ac26c0e108f958406db6ae320e SHA512 a7efb46c5cc3812789f3dacf151e547007c3de1eed3d4a6a5c55cc18d4e1794377f34b55fd9e6a416f91a0ff62a66c0825a1993029ce4656ea64fcc18b9fa3fe WHIRLPOOL b6d474cf1bb9015cfe42214b3ca87e8f4c2ff193443a71fd0c1fd973a5a7683e4501e975354929f91c446a2bfb449f2cb535ca70f26ec35b527458450f0a8ee9
+DIST tesseract-2.01.deu-f.tar.gz 1312785 SHA256 410143cf5029b10d274909439de2c407706e4d601cd5e1bb1309dbd46288757e SHA512 76cc7da4f3a21581705bbae1975ae9a458ca61fa2691645f5b9f64d61ff0222e2c721ecd0c069c3540a65974129f58ae1a08b0d38c3f4d1f45f31d5969d63fb8 WHIRLPOOL 456e7d7f446c1cfca9e483dd85f5bf62c1b24c44535a0dd8600a6188096a1692484a60502bc6537262222cd94c8caae378a2bb698d3628a4223d15e559ad8cfd
+DIST tesseract-2.01.por.tar.gz 2107696 SHA256 0dc30b76814a7694246ca347ccb402bcd40e5e6f3bf70cca31e6d3ca06210baa SHA512 a7d2b3eb206f0cb9e8eee18f55476f8778a8839b3daaa9e10a8d77fec07ce3e37de58017b8fb09b90a4aef026f94df4a15ce77b4db9d6a12815353ee60fcadc7 WHIRLPOOL f15cf92aae31a28ae4c56a9730d6a8af6d87675b5a4eba5dbeadbd65fa609213fb919bb8334c7c430fe0907bbce3107a7d0efed3733487e00ae6b1282d6001d6
+DIST tesseract-2.01.vie.tar.gz 964277 SHA256 8026240029341d45a6142cfccf6f0f98e5b1f35cae5725f8379ac4a8de34283f SHA512 568b91ffa79ca57b613d6548504adf37677fa04a7226d366bc7d4548d1480dc00b397b76f42ef96a2ca0d78b6ffc635fa5586b0cd251d54cf22eb960ab3c920e WHIRLPOOL c32c5e8a5b62f688df43a94a69f0d1326179866e6a9674b625d984ceed26b085764c9b7cd3980507546e23c567f350f9a0ccb3d2d4b2c8d2efe1a1a9ef98d430
+DIST tesseract-2.04.eus.tar.gz 1207994 SHA256 19aa30dda8049fb03e125e3b17d05ae402544e9ec81adcb18964d4a7b125a2fe SHA512 613fedb033f3c678a15d71a7346ad7d2da7d0908f18b0450bc4c198b19e3671fdab025e44a4f6f73257848f626af58c144464ce349a3e5c4b91eebc8b4018c1f WHIRLPOOL 7c0f5556ff2acbc4aac3b60885dc15db22385135c43ea57ad8d4b4226b603e6aad6a346d57099429d3c92bffeda9c9604e621c8d9bc2c98c4b770634250d17e1
+DIST tesseract-2.04.tar.gz 1118386 SHA256 62866f283916553e02cebdeb1b485856c6a790f5f8bf86c30b87c6304374bef8 SHA512 c095407910235f7f914aa6a51feedade3f0b33108c7801b88c5ade26f2b75d1756b034d9ac32ad362a326ee468f97b69476978102ef0cefcc1b5c93be2342d42 WHIRLPOOL 2ce585c295477d17de265bac563d50c249b036301058b98e552b79f040829facea778cfc7692ae06299fc6b55bf2d890e511300c9746be525f9439d0d93d1280
+DIST tesseract-3.03-rc1.tar.gz 12812907 SHA256 d244956236f7491d74d7f342895f611a6c46c45fa9900173d5b7625d8461d2ea SHA512 4acd6a3c0db5568bd6cb199776a52fbf1643692cf2d9da7449644662461c0c3ef7e5941bb49be94135433a90de400413df062edd612ce9ec9c06e9206a57113f WHIRLPOOL 93f33f62aeb5a9f65a7642bc282138622076989618f787a044ad79463ab9cd9a9ebaeb5e34e52cf5c95c569b01fc552a44d2eda24e697d0c9a045fb626b9aa77
+DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
+DIST tesseract-ocr-3.01.heb-com.tar.gz 270977 SHA256 20a9d53172a8dbf1a4bbd7f7e9e3a523a9435c47c751533642e8a9becc8584ff SHA512 378dc49da535f70c860c29b9a43cae478f6d8403c93a623b1781194c02aad3ea12345f9ea6ebbac4fb2033179964d23fb075e6aa206ec79530b41947d5d44411 WHIRLPOOL cc6463928c05d5904af71ea6170e946e601639761eaab317f0570275e0eaee81cba2c0636dc5dec40f8ba6d16ad498e7177a0c2bf5a886f2598c99568f151fd6
+DIST tesseract-ocr-3.01.osd.tar.gz 4320544 SHA256 7861210fd0970ad30503e8c70d7841de6716bd293d8512fd8787a1a07219b7aa SHA512 ad0d6246574db10dbe5a439ba4266765114b1343228608c5ad35bea125c5e308e286a133ecf2fc9407287af56ea57bb48c32f445fef98256a119a2f432f6e2b6 WHIRLPOOL ffa5a9f209e54a36860e2a2cdee955a83df768fbb814717a2d1e0efe05b3aa2283bc14a33cfa72d7179ddeb684587fe04c0d37cefa944ba2182c9c7e6c9affd4
+DIST tesseract-ocr-3.01.slk-frak.tar.gz 292809 SHA256 f35b8a858d509c540a5829d94e8f8800ed25db4c904661000f4c4fa528d5c156 SHA512 a015719fe72b5463b6e9849de0ba5cdb9ed996ac60a47a7fab360c1028cc52b3ad41872b8b35e988f4430f991791ae0837c6823e479cb1549b65d5f530f62fe6 WHIRLPOOL 79419ea93b9d69d4be3ef8399656a5adb6dc383b9496434c99db8f5f0d6fca70314d68e96f59940674a51b79448e43b5ed59389e382528bf050134e6a6edb00d
+DIST tesseract-ocr-3.02.02-doc-html.tar.gz 10635901 SHA256 e7ffd3082005345a682268740140bfdde73461528d6f2da019fef29539477a7b SHA512 4cca5974635ed9c1656a00735bf682ed1eca5cb9a3641a0d063f66ffbdf9dcbc0476628a5b5c48684bd23f5616412e71e9cec608ac979760010c1ee91764290f WHIRLPOOL e84ceb57cbc7065b37424a2d53ce7ecea39f45856efe76610840296f20869742674b8b248b205ba293b7c729f85ff7938defce930409efa907af2d4309ca0a6b
+DIST tesseract-ocr-3.02.ara.tar.gz 6613796 SHA256 2c7be319c30e93950c121897969c1bc1eb1d6bdceb75f1184ee34a6f01d66b6a SHA512 6d4b2a8ba86da08e2692993bde3ad63c7ef003d7b1bb1bb3c9ac1fa628146b7ff305f70c7537af0426c7aa956566cb4a1d37675b3a5440f644627bfc7706d012 WHIRLPOOL e1c0b186931ecdf89fd41f549b291fcf6c5459f61a22f6304f4d126e7217b7f791cb5f39e3315c434d80c1ad454ebae35cd2dbd5e683a970e4f752b6ec59759b
+DIST tesseract-ocr-3.02.eng.tar.gz 12641221 SHA256 c110029560e7f6d41cb852ca23b66899daa4456d9afeeae9d062204bd271bdf8 SHA512 4db016a3809be03855c41363788907f404e08aa277cf891e86de5f0d7da5f4f9fd76f6e19a2a983a7906a94c8235e66608fefe45e0bdc786e44e613896d1f48c WHIRLPOOL f6d891fb2755b6cc2850f52044e94a8dd4dafd7c40bd3f80ba1138e1306b4dfb0d3d6ad0af6131bb39c6ed3b6bc3b3adfd91900f02718fb1a04a0328db79c392
+DIST tesseract-ocr-3.02.heb.tar.gz 1062155 SHA256 da47b0cfe241775c9b36339efda6339d59e146fa6143c65a2253eb9f67164811 SHA512 1a2eb1ff20a52c98607db2f132e7a6789236cbe35eceb7a5ad07db9298afc2d6b4516026e9c1c55f5393d72b906642414ca8ff38869d63aec6fd1c98f5ef9e5d WHIRLPOOL 69a88eef1bede1c949aaa04311e23ba4cbf1f0f05c4f74a7c7c385cdb98470420c42c46fba6d0c3ecd371deca90281ebbfbf013090125a5f9e29ced7f15728a9
+DIST tesseract-ocr-3.02.hin.tar.gz 10117234 SHA256 91f91da5adc73ee71150865d6598df8a50424350480df2753ca9035320b3c78d SHA512 5b86946723b591d2a0289879dd7a9fa015fdd0c63332f877e4bc59281b50cbd61cba5c23a9b9ad677a884207d3bc97e6fcaf832dc8bae6d643e519e53dfdda13 WHIRLPOOL 4bbc9cf2b9a18bf4370b8566e276f39a8166879b3083ced4d686d087a0683289d2050dca22ea67546192297874593bf70e6c6cd28d5a234d830740aa444a2c78
+DIST tesseract-ocr-3.02.tha.tar.gz 3872875 SHA256 7a98e25e0c61dda48cbdb241f0f53c3dfaa7ef574b81799ab2ddac50da6db4fb SHA512 84dd0d2b923449eaa1514c6a61dd4b19b955c2a608bfcb53318c8c2037f6b2afdd1685d6216a9e8987693237c199f28c6b5a709d2d8a3960388296ec89c22b10 WHIRLPOOL e642d87ffdb07e46d0099152c103aa0dc8815ad422f1c891c45c8fcc6153ca9afb5cdf15e819a01a86353067fce1ec1d23ed6d2ce0bf1e1e7f5743419c2a479a
+DIST tgl.traineddata-3.04.00 4114554 SHA256 e794af607426269bb32eedb2f20706e278fbb00e4a75c43dc4a7b8c8e2033938 SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb WHIRLPOOL 767dfce0bb3937d2c7beee8ad454296386383644532de1886df34aa33b3bcc3a70de06dd2d2b336b5efa6fda940970ae091478bad8d64a422a925ee1711ffa91
+DIST tgl.traineddata.gz 978138 SHA256 d4d88e1fb31771d0b42e65291c03da3a167541df7c9682b81d833a4bd6c9e8cf SHA512 68d12d0b2fac37802c0134747d5dc7804f122596ed34d1e22f4744cff0c8d0e40ea2aade77529934190bba148f08351a4973b0ab8ced9de7a3aeda8734e0c908 WHIRLPOOL 357020cccfeff6df926a29139e1b05ee498c2946f368f0928beb5deafa23eeaa8801b335356ab3779a0389384224e4f8ed6cba0979ce50738872dcb54144e82b
+DIST tha.traineddata-3.04.00 13565168 SHA256 ca4a42d4481bd0377cd02731b5149c228bf73e8b7a61e44b9a2d5e274be150f8 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a WHIRLPOOL 07f937618a058313b90a6e1640c37731fbcc9167afba33d9926d57064b9748c4dfec467a240cf74a92a69a1bdb0694c93dc6d18fab8ca99ea3a9228ca184f658
+DIST tur.traineddata-3.04.00 14069931 SHA256 5cbcce5efb66b3da10a14397fbc3a88d8457b9f1b724b9c8d96449b152c21677 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e WHIRLPOOL 6fd2d777c4ca4a5a89db44fb663b80e8540eb3fd4b26e75825b35f49f24f389f7bf2ff91e88f8b2d35cf0969ff7437e37cbf813384d16c94da2b59088a4a364f
+DIST tur.traineddata.gz 933401 SHA256 cb4e187f6c25c145252c88a576f3e3c9204c1d77e1c012172a85980c5c01088b SHA512 2310efbf5a90c638e103463ad08fe3ce821de0a01f90aee99f44b5c7d622bc049807bb69e7a2f97fd5ae39079c1fccb6a3e04235881a4e50d617b5940460ab0b WHIRLPOOL d35eb8fecb516c48f95bb393fc74607f7abac7620229dbdb3cc8f14df5702f2d7939b531afadbc86ec1a1989e6fb9718da28ee2b96b5384a0baad6d182a5514c
+DIST ukr.traineddata-3.04.00 8043189 SHA256 2f8b2cd0f0b5b8612a4b80abcebaa3ac46f5f0368926629b3cff576b9d95bc31 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef WHIRLPOOL 763229993a81d379d6a9d0384ddde95feac95c9e3442a27b94bc3e574235df88dfcd50638c39cba49f966de5f7605aaf884dcc5199715755a4e858be490948e5
+DIST ukr.traineddata.gz 927741 SHA256 a54f0ce0843c863f102bfe135939200fc18702ce61ae6ebc571ab49460849365 SHA512 78f24a43246330b30090fc89b5434e9fb0c79c7ad114c7dd2caa265f3d48b87e91238181f230682bcdce0501b5a17d197ae4791fb9de1dc167e8713c2a45fc28 WHIRLPOOL 665172eaa31913424b66d0b0173b7a9787a73fec8bf031ecd669061814cae55a8bbd4d806efba909b98b982723d419e49bb85f6eb3c6f0ad1106dd33c7687f9c
+DIST vie.traineddata-3.04.00 6096118 SHA256 cef5e63747c86e21bcbbd30bb683a1b104f98293b74b2a89174870d5bb4441c9 SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf WHIRLPOOL abe4f4633dcc9f98c2f0e6da01a4ed419dcf0a8b1261fe528bd147e2f52498cb424e3effea68dfe826d52b55c50ae35350a861138269012232ef83caf234ad89
+DIST vie.traineddata.gz 1575539 SHA256 5f61c32daf9a7071ff0dc95415aed75276538813398e3debb3849bba70bda713 SHA512 1843cb5628544794eab9d78aa87ded3c156a553627537b7e0ec5b5ceb402c723469e525c634ef92924de75ac9f9a4a2b8737b8d0932cae582b0d4d72fc39393e WHIRLPOOL 83d2bbf14d4b7a1d1f846fb053986d1e9f537faf8626e71ac0f83cd120074c58fb5baeff78dd3beec8fab98b2c456ad2b6d2c11c0fb8a56b6b8ecb8741057ad2
diff --git a/app-text/tesseract/files/tesseract-2.04-gcc44.patch b/app-text/tesseract/files/tesseract-2.04-gcc44.patch
new file mode 100644
index 000000000000..7d1f61c19acd
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-2.04-gcc44.patch
@@ -0,0 +1,15 @@
+diff -NrU5 tesseract-2.04.original/viewer/svutil.cpp tesseract-2.04/viewer/svutil.cpp
+--- tesseract-2.04.original/viewer/svutil.cpp	2009-07-25 21:03:18.000000000 +0000
++++ tesseract-2.04/viewer/svutil.cpp	2009-07-25 21:05:54.000000000 +0000
+@@ -41,10 +41,11 @@
+ #include <sys/prctl.h>
+ #endif
+ #endif
+ 
+ #include <iostream>
++#include <cstdio>
+ 
+ const int kBufferSize = 65536;
+ const int kMaxMsgSize = 4096;
+ 
+ // Signals a thread to exit.
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.00-fix-scrollview-disabled.patch b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
new file mode 100644
index 000000000000..7523e3b44960
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.00-fix-scrollview-disabled.patch
@@ -0,0 +1,41 @@
+From 27b8a5cc89898c3f12dae57a58b15efddee9fe18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@gmail.com>
+Date: Thu, 23 Jul 2015 23:14:53 +0200
+Subject: [PATCH] fix GRAPHICS_DISABLED build
+
+---
+ ccstruct/imagedata.cpp | 4 ++++
+ ccstruct/split.cpp     | 5 +++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/ccstruct/imagedata.cpp b/ccstruct/imagedata.cpp
+index 4016a92..3c244c7 100644
+--- a/ccstruct/imagedata.cpp
++++ b/ccstruct/imagedata.cpp
+@@ -17,6 +17,10 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
+ 
+ #include "imagedata.h"
+ 
+diff --git a/ccstruct/split.cpp b/ccstruct/split.cpp
+index 24650d4..6e6ea44 100644
+--- a/ccstruct/split.cpp
++++ b/ccstruct/split.cpp
+@@ -25,6 +25,11 @@
+ /*----------------------------------------------------------------------
+               I n c l u d e s
+ ----------------------------------------------------------------------*/
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "split.h"
+ #include "coutln.h"
+ #include "tprintf.h"
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
new file mode 100644
index 000000000000..ea9495cbaafa
--- /dev/null
+++ b/app-text/tesseract/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>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
+  </maintainer>
+  <maintainer>
+    <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="scrollview"> Enable graphics support
+    (ScrollView).</flag>
+    <flag name="linguas_chr"> Enable support for the Cherokee language.</flag>
+    <flag name="linguas_jp"> Enable support for Japanese.</flag>
+    <flag name="osd"> Enable support orientation and script
+    detection.</flag>
+    <flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/tesseract/tesseract-2.04-r1.ebuild b/app-text/tesseract/tesseract-2.04-r1.ebuild
new file mode 100644
index 000000000000..5eb9d469f89c
--- /dev/null
+++ b/app-text/tesseract/tesseract-2.04-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
+HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
+SRC_URI="http://tesseract-ocr.googlecode.com/files/${P}.tar.gz
+	http://tesseract-ocr.googlecode.com/files/${PN}-2.00.eng.tar.gz
+	linguas_de? (
+		http://tesseract-ocr.googlecode.com/files/${PN}-2.00.deu.tar.gz
+		http://tesseract-ocr.googlecode.com/files/${PN}-2.01.deu-f.tar.gz
+	)
+	linguas_eu? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.04.eus.tar.gz )
+	linguas_es? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.spa.tar.gz )
+	linguas_fr? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.fra.tar.gz )
+	linguas_it? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.ita.tar.gz )
+	linguas_nl? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.00.nld.tar.gz )
+	linguas_pt_BR? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.01.por.tar.gz )
+	linguas_vi? ( http://tesseract-ocr.googlecode.com/files/${PN}-2.01.vie.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 sparc x86"
+IUSE="examples tiff linguas_de linguas_eu linguas_es linguas_fr linguas_it linguas_nl linguas_pt_BR linguas_vi"
+
+DEPEND="tiff? ( media-libs/tiff )"
+RDEPEND="${DEPEND}"
+
+# NOTES:
+# english language files are always installed because they are used by default
+#   that is a tesseract bug and if possible this workaround should be avoided
+#   see bug 287373
+# deu-f corresponds to an old german graphic style named fraktur
+#   that's the same language (german, de)
+# stuff in directory java/ seems useless...
+# in testing/, there is a way to test accuracy, not usable for src_test()
+# app-ocr/ would be a better category
+
+src_prepare() {
+	# move language files to have them installed
+	mv "${WORKDIR}"/tessdata/* tessdata/ || die "move language files failed"
+
+	# remove obsolete makefile, install target only in uppercase Makefile
+	rm "${S}/java/makefile" || die "remove obsolete java makefile failed"
+
+	# fix gcc-4.4 compilation, bug 269320
+	# fix gcc-4.7 compilation, bug 413937
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	econf $(use_with tiff libtiff) \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README ReleaseNotes || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins eurotext.tif phototest.tif || die "doins failed"
+	fi
+}
diff --git a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild b/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
new file mode 100644
index 000000000000..db9a9e9f9529
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN}-ocr"
+DL_P="${MY_PN}-3.02"
+URI_PREFIX="http://${MY_PN}.googlecode.com/files"
+
+inherit eutils autotools autotools-utils versionator
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
+
+DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
+HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${PN}-3.03-rc1.tar.gz
+	${URI_PREFIX}/${DL_P}.eng.tar.gz
+	doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
+	linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
+	linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
+	linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
+	linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
+	linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
+	linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
+				${URI_PREFIX}/deu-frak.traineddata.gz )
+	linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
+				${URI_PREFIX}/dan-frak.traineddata.gz )
+	linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
+	linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
+	linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
+	linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
+	linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
+				${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
+	linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
+	linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
+	linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
+	linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
+	linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
+	linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
+	linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
+	linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
+	linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
+	linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
+	linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
+	linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
+	linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
+	linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
+	linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
+				${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
+	linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
+	linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
+	linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
+				${URI_PREFIX}/swe-frak.traineddata.gz )
+	linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
+	linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
+	linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
+	linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
+	linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
+	linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
+	linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
+	osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
+
+# With opencl tiff is necessary regardless of leptonica status
+DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
+		opencl? ( virtual/opencl
+				  media-libs/tiff:0 )"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable opencl) \
+		$(use_enable scrollview graphics) \
+		--disable-dependency-tracking
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins eurotext.tif phototest.tif
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
+	fi
+
+	# install language files
+	insinto /usr/share/tessdata
+	find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
+	doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
+}
diff --git a/app-text/tesseract/tesseract-3.03_rc1.ebuild b/app-text/tesseract/tesseract-3.03_rc1.ebuild
new file mode 100644
index 000000000000..51763e65c99b
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.03_rc1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN}-ocr"
+DL_P="${MY_PN}-3.02"
+URI_PREFIX="http://${MY_PN}.googlecode.com/files"
+
+inherit eutils autotools autotools-utils versionator
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
+
+DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
+HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${PN}-3.03-rc1.tar.gz
+	${URI_PREFIX}/${DL_P}.eng.tar.gz
+	doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
+	linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
+	linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
+	linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
+	linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
+	linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
+	linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
+				${URI_PREFIX}/deu-frak.traineddata.gz )
+	linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
+				${URI_PREFIX}/dan-frak.traineddata.gz )
+	linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
+	linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
+	linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
+	linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
+	linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
+				${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
+	linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
+	linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
+	linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
+	linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
+	linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
+	linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
+	linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
+	linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
+	linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
+	linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
+	linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
+	linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
+	linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
+	linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
+	linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
+				${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
+	linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
+	linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
+	linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
+				${URI_PREFIX}/swe-frak.traineddata.gz )
+	linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
+	linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
+	linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
+	linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
+	linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
+	linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
+	linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
+	osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg png tiff -webp +scrollview static-libs linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW osd"
+
+DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable scrollview graphics) \
+			--disable-dependency-tracking
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins eurotext.tif phototest.tif
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
+	fi
+
+	# install language files
+	insinto /usr/share/tessdata
+	find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
+	doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
+}
diff --git a/app-text/tesseract/tesseract-3.04.00-r1.ebuild b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
new file mode 100644
index 000000000000..933d91d4af34
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.04.00-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="tesseract-ocr"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/"
+
+inherit eutils autotools autotools-utils
+
+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-${PV}
+	doc? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
+	linguas_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
+	linguas_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
+	linguas_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
+	linguas_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${PV} )
+	linguas_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${PV} )
+	linguas_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${PV}
+				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${PV} )
+	linguas_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${PV}
+				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${PV} )
+	linguas_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${PV} )
+	linguas_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${PV} )
+	linguas_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${PV} )
+	linguas_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${PV} )
+	linguas_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${PV} )
+	linguas_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${PV} )
+	linguas_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${PV} )
+	linguas_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${PV} )
+	linguas_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${PV} )
+	linguas_jp? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${PV} )
+	linguas_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${PV} )
+	linguas_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${PV} )
+	linguas_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${PV} )
+	linguas_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${PV} )
+	linguas_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${PV} )
+	linguas_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${PV} )
+	linguas_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${PV} )
+	linguas_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${PV} )
+	linguas_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${PV} )
+	linguas_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${PV}
+				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${PV} )
+	linguas_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${PV} )
+	linguas_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${PV} )
+	linguas_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${PV} )
+	linguas_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${PV} )
+	linguas_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${PV} )
+	linguas_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${PV} )
+	linguas_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${PV} )
+	linguas_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${PV} )
+	linguas_zh_CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${PV} )
+	linguas_zh_TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${PV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${PV} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
+
+# With opencl tiff is necessary regardless of leptonica status   <-- Check this
+DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
+		opencl? ( virtual/opencl
+				  media-libs/tiff:0 )"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
+	find "${DISTDIR}/" -name "*traineddata-${PV}" \
+		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable opencl) \
+		$(use_enable scrollview graphics) \
+		--disable-dependency-tracking
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	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
+
+	# install language files
+	insinto /usr/share/tessdata
+	doins "${S}"/tessdata/*traineddata*
+}
diff --git a/app-text/tesseract/tesseract-3.04.00.ebuild b/app-text/tesseract/tesseract-3.04.00.ebuild
new file mode 100644
index 000000000000..3afdb4545a06
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.04.00.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN}-ocr"
+DL_P="${MY_PN}-3.02"
+URI_PREFIX="http://${MY_PN}.googlecode.com/files"
+
+inherit eutils autotools autotools-utils
+
+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
+	${URI_PREFIX}/${DL_P}.eng.tar.gz
+	doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
+	linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
+	linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
+	linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
+	linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
+	linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
+	linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
+				${URI_PREFIX}/deu-frak.traineddata.gz )
+	linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
+				${URI_PREFIX}/dan-frak.traineddata.gz )
+	linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
+	linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
+	linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
+	linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
+	linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
+				${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
+	linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
+	linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
+	linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
+	linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
+	linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
+	linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
+	linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
+	linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
+	linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
+	linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
+	linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
+	linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
+	linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
+	linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
+	linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
+				${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
+	linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
+	linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
+	linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
+				${URI_PREFIX}/swe-frak.traineddata.gz )
+	linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
+	linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
+	linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
+	linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
+	linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
+	linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
+	linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
+	osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
+
+# With opencl tiff is necessary regardless of leptonica status   <-- Check this
+DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
+		opencl? ( virtual/opencl
+				  media-libs/tiff:0 )"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable opencl) \
+		$(use_enable scrollview graphics) \
+		--disable-dependency-tracking
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	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
+
+	# install language files
+	insinto /usr/share/tessdata
+	find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
+	doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
+}
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
new file mode 100644
index 000000000000..89b472343236
--- /dev/null
+++ b/app-text/texi2html/Manifest
@@ -0,0 +1 @@
+DIST texi2html-5.0.tar.bz2 15397249 SHA256 e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d WHIRLPOOL d881c31767c5dd26c283910a570ab880fb10f5d11549682056da7a61a22b1a1aa12a9f17a6695124516f57b8952104d9f127e69268f529ed547c2dedc32569be
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/texi2html/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..ed0668c0bc71
--- /dev/null
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..b44459b59326
--- /dev/null
+++ b/app-text/texlive-core/Manifest
@@ -0,0 +1,465 @@
+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-core-patches-36.tar.xz 2200 SHA256 409d48ef65032ec3c335be09ba8eaa5e746a02ed88cc13c0b0b0a5de4007652e SHA512 2e09516ec005a76d0c1fad8edf5930dcd57c77983ec2d8f4b0a020f5a95799797190d95e0e0bfdb1ce378df2337de64967d814cc807630666200ade71c2bf571 WHIRLPOOL d6dc2cf107b128ddb334a28b55da1440cfd249f69a7bbbc3860a1e57a3d22cd2e2c12f429c481f953590528955b491c8fa0b0eb14298ff7913d04b7e33570a84
+DIST texlive-core-patches-39.tar.xz 3056 SHA256 685705f1994b751df42738cb542a6ca0b4adbc013275318667c634665b8bd25b SHA512 95e7161820a648d667c2a69bd74c1d24a20670128889d1ebbec2e700b0459d84bb4d96b2d9f355e519d9efe0e126689b29225af1a184e5a06e0cb398fefc7cc3 WHIRLPOOL 24359dbca04f3e9f9c09a9afc195dd6858da2284947cbebaa770e73ef78276059f9d2e3c8a95c5005971fa64be76367a55887f1f94e423e7d0ca227d5573dc95
+DIST texlive-core-patches-41.tar.xz 2340 SHA256 64f914d6e32c1d91cd484b230e651a2646f94c90e94b8ca5b5accf634bf3905d SHA512 e829c9c68c6f9e7edbf582c6820d5b42483b9411754fcddc6a076ad4790497ef3ea30babbd4950451b543e3b0d960561d6cc099feb54282325040a8009b506b5 WHIRLPOOL d606d537f80aa30bdb05dd5a60afdcf23f9b863fdcc62aa22f1bb5a34ec89b79960efdc89fc19351e6d1f69236363a246cffe9059ee3df67d82308616dfb4bc4
+DIST texlive-core-patches-42.tar.xz 2508 SHA256 e3b4d4de520ff58420a7b695491ffd780d88621c5bef135e59f35e3112ed5fec SHA512 fb5753a25a07f8f9a42494ed96c29f01f11c3f1a070972eafceb8c5ab5fa598c4d7fd5d7533608e6595621394f71563c187e3aaa1e2ba7a6b4e09fe2ae273991 WHIRLPOOL f31aefa1fad71bc294b18655e2db222ce272b6e286693bb62a880a25493d5eed933a3ef549a7a6a814c12677833110f77dcb71f36792aad8755a900a4aba9193
+DIST texlive-core-patches-47.tar.xz 4556 SHA256 9a5f220e25a8d9980486d5599d38e14dc5fc19892354fac92ff890c9e788bcfe SHA512 737a959df416a013a7a1970f5d0c4a6ea3798825375bcd22e532fb0ded4e06c9c21890817d9abf16c6aa3d9e69f082930207c86c4bd7046456eadaa0907f7079 WHIRLPOOL caff55f3a250e38f21c4ef82689fc8273644c51d368ce05509e4e3b521ded826b2c8fcd03363c7c70fd3278101d1a3028eaeee383a65664c7c6d1d8d86cb3046
+DIST texlive-core-patches-48.tar.xz 3528 SHA256 521bffc6a9d3a79fe157855f6a58954b26308230ab2d4daa382f5c101e836177 SHA512 af7e3de4ab378e837a07bf5cd1e0db0bffd043273cc90b6d93484a1a4dfdee52df9846d656ab7821a2b3af82ccdc8ea6f86f35fea97a846166a9cd92e0f06021 WHIRLPOOL 5a5151960dea201cf87fada0a3e3cf297580d6a9b92ed5cc97ee49c0dd8d473798ddc858a4301b16c15dff71d1aafe663ab3017f0f391ea3aad1f0de8506ddc6
+DIST texlive-core-patches-49.tar.xz 2796 SHA256 2c17e0b8d24dd007e86ff7fbe7ef14d42f1b5287e08c133ab2c5c82cedc16709 SHA512 4faf0b9653b9a5335e4b210d15200b4118245687ff12e617f181bdece5d2b5cd827247fc72bdc304722f72d8f017804b8026300a9be18f7663749ddc82c7bb17 WHIRLPOOL 8145a9d5d4fa2713a1aaf0e51f546a20a844d1a12306d7f2b82e66ece961edafd34f9e6aebfc3f3110a23366dc1d43a13cc4fa7fc69c9f67fd300c55f7bb7b92
+DIST texlive-core-patches-50.tar.xz 4632 SHA256 417d50014d1701bb75aee0cfcae95716926fefdc7d0057c9784ba68bd1eab2e4 SHA512 f8fab7940b417b7065c9c467f7a9612e161a1a44db50a4523ee4a092ba381f7580adf1c3d75375165795dfc3f23d005028d67351815481dbdbd6edb13f376b64 WHIRLPOOL 9611be98c2fe494c1d354a23a1c1dfcaf30ca9e6f321056dbe34b99eef64dc8fbcc59428cf5ef8099584968b0b574d0e3e6acac87e37c5583e78eb87f87733b6
+DIST texlive-core-patches-51.tar.xz 3040 SHA256 7edcc57ba831f040a5fcd07080c6e197955c9b979c81c6722c3914fff9ed9a03 SHA512 a1b7132bf25ab0e374e232351cbe64f509a7aab4e795b2d1fb03cd59f7dd0ed87f34c4ee5058dcb544f4b6d7e50d1cf22db29fbb65bde8fe213963856cb486f2 WHIRLPOOL 2c5db621b11cc6c93d0f58aef0221f3a4ace13352fc2de86df89ceeb137edda53fa7f44cb1052570d7a1053417c60910c61b214a61713b9b10c9684fc1983f03
+DIST texlive-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.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-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.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.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-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.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-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.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-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-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.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-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.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-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.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-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.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-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.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-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-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.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-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.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-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-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.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-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-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.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-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.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-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.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-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.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-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.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-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-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.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-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.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-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-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.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-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.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-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.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-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.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-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.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-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.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.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-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.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-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.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-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.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-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.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.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-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.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-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.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-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.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-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.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.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-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-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.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.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-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.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-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-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.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-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.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-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.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-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.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-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.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-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.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.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-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.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-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.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-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.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-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.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-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.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-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.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-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.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-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.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-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.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-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.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-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.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
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..d96b59371a08
--- /dev/null
+++ b/app-text/texlive-core/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>tex</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</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..93789156e7dc
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2012-r1.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/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 "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	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..d02e2b1845e0
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2012-r3.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/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 "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	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.ebuild b/app-text/texlive-core/texlive-core-2012.ebuild
new file mode 100644
index 000000000000..e4ea9ce1d8f6
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2012.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="36"
+TL_SOURCE_VERSION=20120701
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
+	dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
+	hyphenex installfont lacheck latex2man latexfileversion latexpand
+	listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
+	pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
+	texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
+	typeoutfileinfo web	collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
+	dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
+	latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cjk X doc source tk xetex"
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/perl-tk )"
+
+# texdoc needs luatex.
+PDEPEND=">=dev-tex/luatex-0.70"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_prepare() {
+	mkdir -p "${S}" || die "failed to create build dir"
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Bug #265232 and bug #414271:
+	if use hppa; then
+		append-cppflags "-DU_IS_BIG_ENDIAN=1"
+	fi
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir=/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-freetype2-include=/usr/include \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes=/usr/include/teckit \
+		--with-system-graphite \
+		--with-system-kpathsea \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtexu \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-dvipdfmx \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--disable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--disable-xdvipdfmx \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
+}
+
+src_test() {
+	ewarn "Due to modular layout of texlive ebuilds,"
+	ewarn "It would not make much sense to use tests into the ebuild"
+	ewarn "And tests would fail anyway"
+	ewarn "Alternatively you can try to compile any tex file"
+	ewarn "Tex warnings should be considered as errors and reported"
+	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+	emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
+
+	newsbin "${FILESDIR}/texmf-update2010" texmf-update
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${D}/usr/share/texmf/doc"
+	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Remove texdoctk if we don't want it
+	if ! use tk ; then
+		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
+	fi
+
+	# Rename mpost to leave room for mplib
+	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_preinst() {
+	# Remove stray files to keep the upgrade path sane
+	if has_version =app-text/texlive-core-2007* ; then
+		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
+			for j in log fmt ; do
+				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
+				if [ -f "${file}" ] ; then
+					elog "Removing stray ${file} from TeXLive 2007 install."
+					rm -f "${file}"
+				fi
+			done
+		done
+		for j in base log ; do
+			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
+			if [ -f "${file}" ] ; then
+				elog "Removing stray ${file} from TeXLive 2007 install."
+				rm -f "${file}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in /etc/texmf to merge,"
+	elog "please update them and run /usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2013-r1.ebuild b/app-text/texlive-core/texlive-core-2013-r1.ebuild
new file mode 100644
index 000000000000..e69d84581559
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2013-r1.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="41"
+TL_SOURCE_VERSION=20130530
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex2man latexfileversion
+	latexpand ltxfileinfo listings-ext match_parens mkjobtexmf patgen pdfcrop
+	pdftools pfarrei pkfix pkfix-helper purifyeps seetexk sty2dtx synctex
+	texcount texdef texdiff texdirflatten texdoc texliveonfly texloganalyser
+	texware tie tpic2pdftex typeoutfileinfo web	collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex2man.doc latexfileversion.doc latexpand.doc
+	ltxfileinfo.doc listings-ext.doc match_parens.doc mkjobtexmf.doc patgen.doc
+	pdfcrop.doc pdftools.doc pfarrei.doc pkfix.doc pkfix-helper.doc
+	purifyeps.doc sty2dtx.doc synctex.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texliveonfly.doc texloganalyser.doc texware.doc
+	tie.doc tpic2pdftex.doc	typeoutfileinfo web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/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 "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	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..b50eef384a67
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2013-r3.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/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 "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2014-r1.ebuild b/app-text/texlive-core/texlive-core-2014-r1.ebuild
new file mode 100644
index 000000000000..667a01d2adf9
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014-r1.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="42"
+TL_SOURCE_VERSION=20140525
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/perl-tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2014-r3.ebuild b/app-text/texlive-core/texlive-core-2014-r3.ebuild
new file mode 100644
index 000000000000..dae2201129b0
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014-r3.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="47"
+TL_SOURCE_VERSION=20140525
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/perl-tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	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..21edf62cf330
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014-r4.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/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 "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2014.ebuild b/app-text/texlive-core/texlive-core-2014.ebuild
new file mode 100644
index 000000000000..b3b1cfbfb819
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="42"
+TL_SOURCE_VERSION=20140525
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		app-text/teckit
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.0
+	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20130530
+	>=app-text/dvipsk-5.993_p20130530
+	>=dev-tex/bibtexu-3.71_p20130530
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/perl-tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2015.ebuild b/app-text/texlive-core/texlive-core-2015.ebuild
new file mode 100644
index 000000000000..43894fc0e651
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2015.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="51"
+TL_SOURCE_VERSION=20150521
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+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/perl-tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--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 "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	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/metadata.xml b/app-text/texlive/metadata.xml
new file mode 100644
index 000000000000..8ab8b8f60505
--- /dev/null
+++ b/app-text/texlive/metadata.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<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='dvipdfm'>Add support for <pkg>app-text/dvipdfm</pkg> to convert
+	  DVI files to PDF</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-2012.ebuild b/app-text/texlive/texlive-2012.ebuild
new file mode 100644
index 000000000000..81ab1ed8ccb1
--- /dev/null
+++ b/app-text/texlive/texlive-2012.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context detex doc dvi2tty dvipdfm 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 bo 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 ro ru sa_IN sk sl sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${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
+	>=${TEXLIVE_CAT}/texlive-texinfo-${PV}
+	app-text/t1utils
+	>=app-text/lcdf-typetools-2.92[kpathsea]
+	truetype? ( app-text/ttf2pk2 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvipdfm? ( >=app-text/dvipdfm-0.13.2d )
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.85 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? (
+		>=${TEXLIVE_CAT}/texlive-luatex-${PV}
+		>=dev-tex/luatex-0.70
+	)
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/xcolor-2.11
+	>=dev-tex/latex-beamer-3.20
+	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-20080829 )
+	xml? (
+		>=${TEXLIVE_CAT}/texlive-htmlxml-${PV}
+		>=dev-tex/xmltex-1.9-r2
+		app-text/passivetex
+	)
+	jadetex? ( >=app-text/jadetex-3.13-r2 )
+	doc? (
+		>=${TEXLIVE_CAT}/texlive-documentation-base-${PV}
+		linguas_ar? ( >=${TEXLIVE_CAT}/texlive-documentation-arabic-${PV} )
+		linguas_bg? ( >=${TEXLIVE_CAT}/texlive-documentation-bulgarian-${PV} )
+		linguas_zh? ( >=${TEXLIVE_CAT}/texlive-documentation-chinese-${PV} )
+		linguas_cs? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
+		linguas_sk? ( >=${TEXLIVE_CAT}/texlive-documentation-czechslovak-${PV} )
+		linguas_nl? ( >=${TEXLIVE_CAT}/texlive-documentation-dutch-${PV} )
+		linguas_en? ( >=${TEXLIVE_CAT}/texlive-documentation-english-${PV} )
+		linguas_fi? ( >=${TEXLIVE_CAT}/texlive-documentation-finnish-${PV} )
+		linguas_fr? ( >=${TEXLIVE_CAT}/texlive-documentation-french-${PV} )
+		linguas_de? ( >=${TEXLIVE_CAT}/texlive-documentation-german-${PV} )
+		linguas_it? ( >=${TEXLIVE_CAT}/texlive-documentation-italian-${PV} )
+		linguas_ja? ( >=${TEXLIVE_CAT}/texlive-documentation-japanese-${PV} )
+		linguas_ko? ( >=${TEXLIVE_CAT}/texlive-documentation-korean-${PV} )
+		linguas_mn? ( >=${TEXLIVE_CAT}/texlive-documentation-mongolian-${PV} )
+		linguas_pl? ( >=${TEXLIVE_CAT}/texlive-documentation-polish-${PV} )
+		linguas_pt? ( >=${TEXLIVE_CAT}/texlive-documentation-portuguese-${PV} )
+		linguas_ru? ( >=${TEXLIVE_CAT}/texlive-documentation-russian-${PV} )
+		linguas_sr? ( >=${TEXLIVE_CAT}/texlive-documentation-serbian-${PV} )
+		linguas_sl? ( >=${TEXLIVE_CAT}/texlive-documentation-slovenian-${PV} )
+		linguas_es? ( >=${TEXLIVE_CAT}/texlive-documentation-spanish-${PV} )
+		linguas_th? ( >=${TEXLIVE_CAT}/texlive-documentation-thai-${PV} )
+		linguas_tr? ( >=${TEXLIVE_CAT}/texlive-documentation-turkish-${PV} )
+		linguas_uk? ( >=${TEXLIVE_CAT}/texlive-documentation-ukrainian-${PV} )
+		linguas_vi? ( >=${TEXLIVE_CAT}/texlive-documentation-vietnamese-${PV} )
+	)
+	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langarmenian-${PV}
+				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.2 )
+	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langcroatian-${PV} )
+	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
+	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langdanish-${PV} )
+	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langdutch-${PV} )
+	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langfinnish-${PV} )
+	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langhebrew-${PV} )
+	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langhungarian-${PV} )
+	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langlatin-${PV} )
+	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langlithuanian-${PV} )
+	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langlatvian-${PV} )
+	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langmongolian-${PV} )
+	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
+	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
+	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langnorwegian-${PV} )
+	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV}
+	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langswedish-${PV} )
+	linguas_bo?    ( >=${TEXLIVE_CAT}/texlive-langtibetan-${PV} )
+	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langturkmen-${PV} )
+	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langvietnamese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/texlive/texlive-2013.ebuild b/app-text/texlive/texlive-2013.ebuild
new file mode 100644
index 000000000000..e4aa6a3fc243
--- /dev/null
+++ b/app-text/texlive/texlive-2013.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context detex dvi2tty dvipdfm 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_IN sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${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 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvipdfm? ( >=app-text/dvipdfm-0.13.2d )
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.85 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? (
+		>=${TEXLIVE_CAT}/texlive-luatex-${PV}
+		>=dev-tex/luatex-0.70
+	)
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/xcolor-2.11
+	>=dev-tex/latex-beamer-3.20
+	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 )
+	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.3-r1 )
+	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
+	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/texlive/texlive-2014.ebuild b/app-text/texlive/texlive-2014.ebuild
new file mode 100644
index 000000000000..9ac679923611
--- /dev/null
+++ b/app-text/texlive/texlive-2014.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~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_IN sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${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 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.85 )
+	>=${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.20
+	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 )
+	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.3-r1 )
+	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
+	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	linguas_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	linguas_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/texlive/texlive-2015.ebuild b/app-text/texlive/texlive-2015.ebuild
new file mode 100644
index 000000000000..30099ebccc33
--- /dev/null
+++ b/app-text/texlive/texlive-2015.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x64-freebsd ~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_IN sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${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 )
+	linguas_af? ( >=${TEXLIVE_CAT}/texlive-langafrican-${PV}
+				  >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	linguas_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.3-r1 )
+	linguas_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} >=app-text/vlna-1.3 )
+	linguas_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	linguas_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_en_GB? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	linguas_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	linguas_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	linguas_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	linguas_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_as?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_sa_IN? ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	linguas_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	linguas_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	linguas_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	linguas_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	                 >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	linguas_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	linguas_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	linguas_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	linguas_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	linguas_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	linguas_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
new file mode 100644
index 000000000000..3c54250435aa
--- /dev/null
+++ b/app-text/tkinfo/Manifest
@@ -0,0 +1 @@
+DIST tkinfo-2.8.tar.gz 56234 SHA256 0dfa737dbb3f71e7816b444df2adc1f3a7bdb6c0d44c6f41ab42543d590eb152 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76 WHIRLPOOL 09b4c2b883aea9a51d592db34ba79d7716d49cba816dbcadd0f3fa8acf94b3af8c9258542f3239cb7462126e5d16d18ce2b234e26d4a93a8b0369624611154fd
diff --git a/app-text/tkinfo/metadata.xml b/app-text/tkinfo/metadata.xml
new file mode 100644
index 000000000000..d9cd2cad66c2
--- /dev/null
+++ b/app-text/tkinfo/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/tkinfo/tkinfo-2.8.ebuild b/app-text/tkinfo/tkinfo-2.8.ebuild
new file mode 100644
index 000000000000..f4f36c7a743b
--- /dev/null
+++ b/app-text/tkinfo/tkinfo-2.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Info Browser in TK"
+SRC_URI="http://math-www.uni-paderborn.de/~axel/tkinfo/${P}.tar.gz"
+HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
+
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
+IUSE=""
+LICENSE="freedist"
+SLOT="0"
+
+RDEPEND=">=dev-lang/tk-8.0.5"
+DEPEND=">=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "1 s:^.*:#!/usr/bin/wish:" tkinfo || \
+			die "sed tkinfo failed"
+}
+
+src_install () {
+	dobin tkinfo
+	doman tkinfo.1
+	dodoc README
+}
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
new file mode 100644
index 000000000000..f0a586e757f3
--- /dev/null
+++ b/app-text/tkman/Manifest
@@ -0,0 +1 @@
+DIST tkman-2.2.tar.gz 229273 SHA256 ae2fde02705f154c119c76ca2d9c4132f01706359d218508b682652c8cfb3173 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777 WHIRLPOOL 703a9b9ed432191b5b6a9e10f93a932473a111780b0f190421aa6151f008e05186cc720d83ae4c7880ce4ff4769aab0e72311fb33f9f04b748ff26b7688d8895
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..9e61f2c0404d
--- /dev/null
+++ b/app-text/tkman/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..77c1e7629d47
--- /dev/null
+++ b/app-text/tkman/tkman-2.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..21c00b221620
--- /dev/null
+++ b/app-text/tofrodos/Manifest
@@ -0,0 +1 @@
+DIST tofrodos-1.7.12a.tar.gz 97588 SHA256 3098af78325486b99116c65c9f9bbbbfb3dfbeab1ab1e63a8da79550a5af6a08 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2 WHIRLPOOL 73491c118a219a4cc25d2763b28a3cc10bcdaa08ae01a3cc99842254f6df3afb4662b25d2d73b1bb6e36408fc32007bc4a758361a5a951679c616fdae3f5aecb
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..3f2f97787b50
--- /dev/null
+++ b/app-text/tofrodos/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>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer>
+		<email>vostorga@gentoo.org</email>
+		<name>Victor Ostorga</name>
+	</maintainer>
+</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..49d73000aa89
--- /dev/null
+++ b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="text file conversion utility that converts ASCII files between the
+MSDOS format 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..d7972174c56a
--- /dev/null
+++ b/app-text/tokyodystopia/Manifest
@@ -0,0 +1 @@
+DIST tokyodystopia-0.9.15.tar.gz 158522 SHA256 28b43c592a127d1c9168eac98f680aa49d1137b4c14b8d078389bbad1a81830a SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd WHIRLPOOL 46a76637fb3f212622e9439d477c989f0b0064c590e625ed06e6d5ebaa366fef016e614a2b85eff8837643a05cae627cb27a1cbfb30cefde3b74eb155fc6e18e
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..24cbb90cf0c4
--- /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>
+		<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..cd4c2e5337cf
--- /dev/null
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..010b2099dfbf
--- /dev/null
+++ b/app-text/trang/Manifest
@@ -0,0 +1 @@
+DIST trang-20091111.zip 1079534 SHA256 d8a3f034f9918ebe5b265aafeadbee6729ddda5732cfc368e2c30b3b8c0ca598 SHA512 c19bf98613097d377ecce347dcab31b458b16d77c320b5d2a6106ff7b06b3aa3c7b87b4c78376b3d4f89be24ecb11fad622aadc0ba9d8d6be716486d7a1ebd7b WHIRLPOOL 6ed18632dfdb7c9661fcb6e1b3a02130ac877fdda3c4cc7779ec61510a7e67e68ab7315ab6f3e5cb8ed2a83447873579791c568f7706eaab29f5e2258fa5bc3b
diff --git a/app-text/trang/files/build.xml b/app-text/trang/files/build.xml
new file mode 100644
index 000000000000..104cabd267a4
--- /dev/null
+++ b/app-text/trang/files/build.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Author: Ralph Sennhauser -->
+<project name="trang" default="jar" basedir=".">
+
+  <!-- properties -->
+
+  <property name="src.dir" value="src"/>
+  <property name="build.dir" value="build"/>
+  <property name="docs.dir" value="javadoc"/>
+  <property name="dist.dir" value="dist"/>
+
+  <property name="app.name" value="trang"/>
+  <property name="package.names" value="com.* org.*"/>
+  <property name="jar.name" value="${app.name}.jar"/>
+
+  <!-- targets -->
+
+  <target name="prepare">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${docs.dir}"/>
+    <mkdir dir="${dist.dir}"/>
+    <unzip src="${src.dir}.zip" dest="${src.dir}"/>
+	<!-- need the resource files shipped inside the jar, beed! -->
+    <unzip src="trang.jar" dest="${build.dir}">
+	  <patternset>
+	    <include name="**/*properties"/>
+	  </patternset>
+	</unzip>
+  </target>
+
+  <target name="compile" description="Compiles source" depends="prepare">
+    <javac srcdir="${src.dir}" destdir="${build.dir}" encoding="UTF-8" classpath="${gentoo.classpath}">
+<!--      <compilerarg value="-Xlint:deprecation"/> -->
+<!--      <compilerarg value="-Xlint"/> -->
+    </javac>
+  </target>
+
+  <target name="javadoc" depends="prepare" description="Create javadocs">
+    <javadoc packagenames="net.*"
+			 classpath="${gentoo.classpath}"
+             sourcepath="${src.dir}"
+             defaultexcludes="yes"
+             destdir="./${docs.dir}"
+             author="true"
+             version="true"
+             use="true"
+             windowtitle="${app.name} API">
+      <fileset dir="${src.dir}"/>
+    </javadoc>
+  </target>
+
+  <target name="jar" description="Create the jar" depends="compile">
+    <jar destfile="${dist.dir}/${jar.name}" basedir="${build.dir}">
+      <manifest>
+        <attribute name="Main-Class" value="com.thaiopensource.relaxng.translate.Driver"/>
+        <attribute name="Class-Path" value="."/>
+      </manifest>
+	  <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine">
+	    <provider classname="com.thaiopensource.datatype.xsd.regex.java.RegexEngineImpl"/>
+	  	<provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/>
+	  </service>
+	  <service type="org.relaxng.datatype.DatatypeLibraryFactory">
+        <provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/>
+	  </service>	
+    </jar>
+  </target>
+
+</project>
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..8c6a042450d3
--- /dev/null
+++ b/app-text/trang/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">jing-trang</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/trang/trang-20091111-r1.ebuild b/app-text/trang/trang-20091111-r1.ebuild
new file mode 100644
index 000000000000..fcc80852348f
--- /dev/null
+++ b/app-text/trang/trang-20091111-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+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="http://jing-trang.googlecode.com/files/${P}.zip"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+java_prepare() {
+	# need resource files in jar archive so can't remove, see build.xml
+	# rm -v *.jar || die "Failed to remove jar archives"
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die
+}
+
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+
+src_test() {
+	java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.xsd"
+	java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.dtd"
+	java -jar "dist/${PN}.jar" "test/test.dtd" "test/test.dtd.xsd"
+
+	md5sum -c <<MD5SUMS_END || die "Failed to verify md5sum"
+4bcb454ade46c0188f809d2e8ce15315  "${FILESDIR}"/test.xml
+d096c1fb462902e10a3440a604a21664  test/test.xsd
+3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
+fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
+MD5SUMS_END
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	java-pkg_dolauncher trang \
+		--main com.thaiopensource.relaxng.translate.Driver
+	dohtml *.html || die
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/{org,com}
+}
diff --git a/app-text/trang/trang-20091111.ebuild b/app-text/trang/trang-20091111.ebuild
new file mode 100644
index 000000000000..d2f55b7db61d
--- /dev/null
+++ b/app-text/trang/trang-20091111.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+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="http://jing-trang.googlecode.com/files/${P}.zip"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	>=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+java_prepare() {
+	# need resource files in jar archive so can't remove, see build.xml
+	# rm -v *.jar || die "Failed to remove jar archives"
+
+	cp "${FILESDIR}/build.xml" "${S}/build.xml"
+}
+
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+
+src_test() {
+	# a very simple test
+	mkdir "test"
+
+	java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.xsd"
+	java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.dtd"
+	java -jar "dist/${PN}.jar" "test/test.dtd" "test/test.dtd.xsd"
+
+	md5sum -c <<MD5SUMS_END || die "Failed to verify md5sum"
+4bcb454ade46c0188f809d2e8ce15315  ${FILESDIR}/test.xml
+d096c1fb462902e10a3440a604a21664  test/test.xsd
+3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
+fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
+MD5SUMS_END
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	java-pkg_dolauncher trang \
+		--main com.thaiopensource.relaxng.translate.Driver
+	dohtml *.html || die
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/{org,com}
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
new file mode 100644
index 000000000000..be4205b5b618
--- /dev/null
+++ b/app-text/tree/Manifest
@@ -0,0 +1 @@
+DIST tree-1.7.0.tgz 47082 SHA256 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12 SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a WHIRLPOOL 2bec275486ef30075fbe34aea9c96ba3455e328f02a1259e88a9227d1cddda543c1f5670f973ce5a7b9ea96fb9d886598d5008f5ed34db90cd0b5c59402ca5d1
diff --git a/app-text/tree/files/tree.bashcomp b/app-text/tree/files/tree.bashcomp
new file mode 100644
index 000000000000..b0f5e4861902
--- /dev/null
+++ b/app-text/tree/files/tree.bashcomp
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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..3e22333a0f4b
--- /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>
+    <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..29c53797590d
--- /dev/null
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d35c27d7adfb
--- /dev/null
+++ b/app-text/ttf2pk2/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/app-text/ttf2pk2/metadata.xml b/app-text/ttf2pk2/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/ttf2pk2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</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..ead91abb88c0
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-1.5_p20120701.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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-1.5_p20130530.ebuild b/app-text/ttf2pk2/ttf2pk2-1.5_p20130530.ebuild
new file mode 100644
index 000000000000..b5f0e4575fde
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-1.5_p20130530.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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.1.0_p20120701
+		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_p20140525.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
new file mode 100644
index 000000000000..a2696fd47e60
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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..77d1938f8b9a
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
new file mode 100644
index 000000000000..879845b69531
--- /dev/null
+++ b/app-text/ttf2pt1/Manifest
@@ -0,0 +1 @@
+DIST ttf2pt1-3.4.4.tgz 230547 SHA256 ae926288be910073883b5c8a3b8fc168fde52b91199fdf13e92d72328945e1d0 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014 WHIRLPOOL 10d4f372e52bbba9f405a3e811f7404a47f25259655f0ce85e4e06381c4a69cbce79833f5d15d900d4bd09cb740b4a74ce1506e56c1f58a67b2f3cf90da7884a
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..385e589278eb
--- /dev/null
+++ b/app-text/ttf2pt1/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+	<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..a80d4686dac0
--- /dev/null
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f5107bb45536
--- /dev/null
+++ b/app-text/tuxcards/Manifest
@@ -0,0 +1 @@
+DIST tuxcards-2.2.1.tar.gz 310015 SHA256 fff20cc4c1fb3eb441af0d765466b2c113750281f30f5dfc4109096803da0a73 SHA512 70d420f57e4d08341f4137fce0fd4d7afe59b9af5a4ef821d93b3aac912401772cdab2d240470ab96ba6c91a1548eecac87fcaa6c746e93d18d7b5be69d86052 WHIRLPOOL cdda5a11f492bfbb739d579bfa44b28567354ff8be4a30d570224d15bf1f01486ddd83fe69b60dffc41461d817bb2cc7fe7a4c9acf226fdd70157ff7a700695e
diff --git a/app-text/tuxcards/metadata.xml b/app-text/tuxcards/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/app-text/tuxcards/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>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/tuxcards/tuxcards-2.2.1.ebuild b/app-text/tuxcards/tuxcards-2.2.1.ebuild
new file mode 100644
index 000000000000..1665285c59a4
--- /dev/null
+++ b/app-text/tuxcards/tuxcards-2.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit eutils qt4-r2
+
+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_install() {
+	dobin ${PN} || die
+	newicon src/icons/lo32-app-tuxcards.png ${PN}.png
+	make_desktop_entry ${PN} TuxCards ${PN} "Qt;Utility"
+	dodoc AUTHORS README || die
+}
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
new file mode 100644
index 000000000000..2555be44189a
--- /dev/null
+++ b/app-text/txt2man/Manifest
@@ -0,0 +1 @@
+DIST txt2man-1.5.6.tar.gz 16293 SHA256 984825c5fd0cb3495160bf3277f327078081a8dc219dc466509e307ec9a2b52a SHA512 dd1cb5a6385d75b459fb61c49e0b73e5cafa5af8b11d9b89e5c206a9c5b65e4daac4d0e768c28963aacde772b715cb11ed0e843e42397b2df894a1f68c70ca65 WHIRLPOOL 50f16463f7ee77f030ca65e9eacdd4c0e7ec43d4e707c8952d5e08d4274beda51d955a624fe227340b436704658e2e7b20d585868bf84f3a01902cb49cdc36c1
diff --git a/app-text/txt2man/metadata.xml b/app-text/txt2man/metadata.xml
new file mode 100644
index 000000000000..be67c1647ee7
--- /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>
+		<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..30e388de9a7e
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.5.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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/txt2pdbdoc/Manifest b/app-text/txt2pdbdoc/Manifest
new file mode 100644
index 000000000000..4575d109e67d
--- /dev/null
+++ b/app-text/txt2pdbdoc/Manifest
@@ -0,0 +1 @@
+DIST txt2pdbdoc-1.4.4.tar.gz 77486 SHA256 db9e58a073d722c59c7fd1ffd6ebe3fc1be2007e826d6be5f94de26ea5a0c895 SHA512 db3f89b30a99afff79ad54ee600ff661ea750ffd39f0b2dfdb94dade42df930f5890839cd157fc77666887604ce5abc866d127176d2a9a36b4305cf0a30c6c93 WHIRLPOOL ab4436a4c45c906e14827bb50e10beb448c81e58a9937c63b4a0e512d6fdd483f5128a5f613d97251574915b02dfa94b659f98be8f5c531d7a0acb16e5ddac52
diff --git a/app-text/txt2pdbdoc/metadata.xml b/app-text/txt2pdbdoc/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/app-text/txt2pdbdoc/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>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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..c2fe0dc7148d
--- /dev/null
+++ b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..51cb6820af2f
--- /dev/null
+++ b/app-text/txt2tags/Manifest
@@ -0,0 +1 @@
+DIST txt2tags-2.6.tgz 544724 SHA256 601467d7860f3cfb3d48050707c6277ff3ceb22fa7be4f5bd968de540ac5b05c SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e WHIRLPOOL d9cb30d9cfba1218b06698596e7213cac62b9adfa21c386ce65fe2919762425dac12cff493d5b5f70dac5bff9dffc3672f2b44e6165ffca5b7a96623b37e5ea3
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..b95cef418f1a
--- /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>
+		<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..d292e5cc5726
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+
+inherit eutils elisp-common python-single-r1
+
+DESCRIPTION="A tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup"
+HOMEPAGE="http://txt2tags.org/"
+SRC_URI="http://${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/txt2tags/txt2tags-2.6.ebuild b/app-text/txt2tags/txt2tags-2.6.ebuild
new file mode 100644
index 000000000000..5163c9e748b3
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-2.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="tk"
+PYTHON_DEPEND="2"
+
+inherit eutils elisp-common python
+
+DESCRIPTION="A tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup"
+HOMEPAGE="http://txt2tags.org/"
+SRC_URI="http://${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="dev-lang/python
+	tk? ( dev-lang/tk )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	emacs? ( virtual/emacs )"
+
+RDEPEND="${DEPEND}"
+
+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 || die
+
+	dodoc README ChangeLog* || die
+	insinto /usr/share/doc/${PF}
+	doins doc/*.{pdf,t2t} || die
+	# samples go into "samples" doc directory
+	docinto samples
+	dodoc samples/sample.* || die
+	docinto samples/css
+	dodoc samples/css/* || die
+	docinto samples/img
+	dodoc samples/img/* || die
+	docinto samples/module
+	dodoc samples/module/* || die
+	# extras go into "extras" doc directory
+	insinto /usr/share/doc/${PF}/extras
+	doins -r extras/* || die
+	newman doc/manpage.man txt2tags.1 || die
+
+	# 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_convert_shebangs -r 2 "${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..07b88be7eb4c
--- /dev/null
+++ b/app-text/u2ps/Manifest
@@ -0,0 +1 @@
+DIST u2ps-full-0.8.4.tar.gz 5496922 SHA256 accf30cdce12fc722edc51a86c7dc4afdc34a34a7a10260805e4bcdbdfab0880 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e WHIRLPOOL a91cb69252de557d97c6c7dec91359e391ee2282140fcd05fe817ac47a25bc8126681fbce27f79270bb81b0be572ba4d2bea5cca83e10908652eeba11f11433e
diff --git a/app-text/u2ps/metadata.xml b/app-text/u2ps/metadata.xml
new file mode 100644
index 000000000000..5c07908ce9d2
--- /dev/null
+++ b/app-text/u2ps/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>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">
+</longdescription>
+	<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..f104670819df
--- /dev/null
+++ b/app-text/u2ps/u2ps-0.8.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="http://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..2faaf3a9ab11
--- /dev/null
+++ b/app-text/unac/Manifest
@@ -0,0 +1 @@
+DIST unac_1.8.0.orig.tar.gz 281807 SHA256 29d316e5b74615d49237556929e95e0d68c4b77a0a0cfc346dc61cf0684b90bf SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8 WHIRLPOOL 50878306e85f3f78743ea416988db33ecacfeb651ebb255669bbc709e243bd575bacdeca400052b09940961b1a6ffe99d3074cc4d37786a4a6f70d9448d8d918
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..8072c2f3d376
--- /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>
+	<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..65f917f186b8
--- /dev/null
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ecf2b48ad870
--- /dev/null
+++ b/app-text/unpaper/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
new file mode 100644
index 000000000000..ed58eb5dac66
--- /dev/null
+++ b/app-text/unpaper/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>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+  <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..649b50e06f48
--- /dev/null
+++ b/app-text/unpaper/unpaper-5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c973f26c2bcc
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8e0ecf3d699c
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c973f26c2bcc
--- /dev/null
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3387ee0af3a9
--- /dev/null
+++ b/app-text/unrtf/Manifest
@@ -0,0 +1 @@
+DIST unrtf-0.21.9.tar.gz 828590 SHA256 22a37826f96d754e335fb69f8036c068c00dd01ee9edd9461a36df0085fb8ddd SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03 WHIRLPOOL 05524fd8d4b66d08fdbd1e2e55c2e07b5865b64970bf452e4cd3379421a6d2f6d9aed432337e78490bae23c7801c371d1460cba9abc44ffb5a4a6aa1c809004c
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..c6d862855eb5
--- /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>
+  <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..338aa7416457
--- /dev/null
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Converts RTF files to various formats"
+HOMEPAGE="http://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..f47afed0cc0b
--- /dev/null
+++ b/app-text/uudeview/Manifest
@@ -0,0 +1 @@
+DIST uudeview-0.5.20.tar.gz 261574 SHA256 e49a510ddf272022af204e96605bd454bb53da0b3fe0be437115768710dae435 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c WHIRLPOOL 4c18f8b1930852c89d2d0ca31e64d3eb06c19cef58d0901e3cafe0ae73b1245b749e7548d1726f772a631c2ffa2ad15b815861ab6dc779e8184334948c149326
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-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..f9d50da18d39
--- /dev/null
+++ b/app-text/uudeview/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>
+		<email>maintainer-needed@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/uudeview/uudeview-0.5.20-r1.ebuild b/app-text/uudeview/uudeview-0.5.20-r1.ebuild
new file mode 100644
index 000000000000..8277e3829eb1
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+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="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="tk"
+
+RDEPEND="tk? ( dev-lang/tk )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-bugfixes.patch"
+	epatch "${FILESDIR}/${P}-CVE-2004-2265.patch"
+	epatch "${FILESDIR}/${P}-CVE-2008-2266.patch"
+	epatch "${FILESDIR}/${P}-man.patch"
+	epatch "${FILESDIR}/${P}-rename.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tk tcl) \
+		$(use_enable tk)
+}
+
+src_install() {
+	# upstream's Makefiles are just broken
+	einstall MANDIR="${ED}/usr/share/man/" || die "Failed to install"
+	dodoc HISTORY INSTALL README
+}
diff --git a/app-text/uvconv/Manifest b/app-text/uvconv/Manifest
new file mode 100644
index 000000000000..5203bf608284
--- /dev/null
+++ b/app-text/uvconv/Manifest
@@ -0,0 +1 @@
+DIST uvconv-1.1.3b.tar.gz 36895 SHA256 b5c7ae6c6ae62de748dd24cc2665a4e18f2ae14a999004d64551823235b4bf14 SHA512 4a5058dea321b7441699ffdd8c5ef9f1f72632ef5e73ecce1d59434b8e8ea7c028739ba7f79123e7bc08439249cbc5b590e3341970ba576149b6d5e42a3d4c87 WHIRLPOOL b716972cc114975fb560cbf5950fb635abcc63ebc0bb41755363433286a3abf9978678058176cd8df50d9bc7f04d8ab5101dc8f5de14b4b590b81d23c8095c6b
diff --git a/app-text/uvconv/files/uvconv-1.1.3b-gcc43.patch b/app-text/uvconv/files/uvconv-1.1.3b-gcc43.patch
new file mode 100644
index 000000000000..900bfa90740a
--- /dev/null
+++ b/app-text/uvconv/files/uvconv-1.1.3b-gcc43.patch
@@ -0,0 +1,10 @@
+--- uvconv.orig/uvconvert/uvconvert.cpp	2004-07-26 05:19:18.000000000 +0900
++++ uvconv/uvconvert/uvconvert.cpp	2008-12-17 17:57:23.000000000 +0900
+@@ -19,6 +19,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ --------------------------------------------------------------------------------*/
+ 
++#include <cstring>
+ #include "prehdr.h"
+ #include "vnconv.h"
+ 
diff --git a/app-text/uvconv/files/uvconv-1.1.3b-ldflags.patch b/app-text/uvconv/files/uvconv-1.1.3b-ldflags.patch
new file mode 100644
index 000000000000..3aef9b3c3038
--- /dev/null
+++ b/app-text/uvconv/files/uvconv-1.1.3b-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/uvconvert/Makefile b/uvconvert/Makefile
+index 8819779..c610965 100644
+--- a/uvconvert/Makefile
++++ b/uvconvert/Makefile
+@@ -6,7 +6,7 @@ OPTFLAGS="-O3"
+ 
+ all: uvconv
+ uvconv: ${OBJS} libvnconv
+-	${CXX} ${CXXFLAGS} ${OPTFLAGS} -o $@ ${OBJS} ${LIBS}
++	${CXX} ${CXXFLAGS} ${OPTFLAGS} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
+ 
+ ${OBJS}: %.o: %.cpp
+ 	${CXX} ${CXXFLAGS} ${OPTFLAGS} -c $< -o $@ -I${INCLUDE_DIR}
diff --git a/app-text/uvconv/metadata.xml b/app-text/uvconv/metadata.xml
new file mode 100644
index 000000000000..c225088eb91e
--- /dev/null
+++ b/app-text/uvconv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge">unikey</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/uvconv/uvconv-1.1.3b-r1.ebuild b/app-text/uvconv/uvconv-1.1.3b-r1.ebuild
new file mode 100644
index 000000000000..f1ba96c6dadc
--- /dev/null
+++ b/app-text/uvconv/uvconv-1.1.3b-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A small utility that converts among Vietnamese charsets"
+HOMEPAGE="http://unikey.org/"
+SRC_URI="mirror://sourceforge/unikey/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" OPTFLAGS="${CFLAGS}" -C uvconvert
+}
+
+src_install() {
+	dobin uvconvert/${PN}
+	doman uvconv.1
+	dodoc readme.txt AUTHORS CREDITS changes.txt
+}
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
new file mode 100644
index 000000000000..6724fe9e456a
--- /dev/null
+++ b/app-text/vilistextum/Manifest
@@ -0,0 +1 @@
+DIST vilistextum-2.6.9.tar.bz2 147743 SHA256 dddf05b4b9dbb408ea37b5654666f8cf57b5c1da0dd722de763bc86788723d0f SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d WHIRLPOOL b9b6011763143c49a0e5496a42102173b4aa5d16b6c21ccf60d3018ce7c3c7b86b54fc3cbe8bf58b1a3344de498768d79c9ebc7e5c2b3f0a51d822c45e69a56b
diff --git a/app-text/vilistextum/files/vilistextum-2.6.7-gentoo.diff b/app-text/vilistextum/files/vilistextum-2.6.7-gentoo.diff
new file mode 100644
index 000000000000..4e00684041d9
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.7-gentoo.diff
@@ -0,0 +1,22 @@
+diff -urN vilistextum-2.6.7.orig/src/Makefile.am vilistextum-2.6.7/src/Makefile.am
+--- vilistextum-2.6.7.orig/src/Makefile.am	2004-12-23 05:53:36.588116792 -0500
++++ vilistextum-2.6.7/src/Makefile.am	2004-12-23 06:05:30.567575416 -0500
+@@ -8,7 +8,7 @@
+ 
+ # profiling
+ #AM_CFLAGS = -Wall -pg
+-AM_CFLAGS = -O2 -Wall #-ansi #-pedantic-error -funsigned-char
++AM_CFLAGS = -Wall #-ansi #-pedantic-error -funsigned-char
+ AM_LDFLAGS = $(STATIC)
+ 
+ EXTRA_DIST = kilistextum.kaptn
+diff -urN vilistextum-2.6.7.orig/tests/Makefile.am vilistextum-2.6.7/tests/Makefile.am
+--- vilistextum-2.6.7.orig/tests/Makefile.am	2004-12-23 05:53:36.592116184 -0500
++++ vilistextum-2.6.7/tests/Makefile.am	2004-12-23 06:05:43.825559896 -0500
+@@ -16,5 +16,5 @@
+ 
+ test: check
+ 
+-all: check
++all:
+ 
diff --git a/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff b/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff
new file mode 100644
index 000000000000..4d492e97e9f8
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff
@@ -0,0 +1,490 @@
+diff -uwr vilistextum-2.6.7/CHANGES vilistextum-2.6.7-gentoo/CHANGES
+--- vilistextum-2.6.7/CHANGES	2004-12-20 00:05:47.000000000 +0100
++++ vilistextum-2.6.7-gentoo/CHANGES	2005-01-02 09:14:58.000000000 +0100
+@@ -1,9 +1,15 @@
++2.6.7-gentoo: (02.01.2005)
++
++  - configure fixed to correctly process --disable-multibyte
++  - configure falls back to standard iconv() if no libiconv is found
++  - BUGFIX: three off-by-one error in get_attr found by Ewald Dieterich
++
+ 2.6.7: (19.12.2004)
+ 
+-  - BUGFIX: buffer overflow in get_attr found by Ariel Berkman
++  - BUGFIX: buffer overflow in get_attr() found by Ariel Berkman
+   - BUGFIX: compilation fix for Solaris by Fredrik Roubert
+   - more robust behaviour when encountering invalid byte sequences
+-  - added RPM-spec file by Joshua Jensen.
++  - added RPM-spec file by Joshua Jensen
+ 
+ 2.6.6: (24.08.2004)
+ 
+diff -uwr vilistextum-2.6.7/INSTALL vilistextum-2.6.7-gentoo/INSTALL
+--- vilistextum-2.6.7/INSTALL	2004-04-20 12:10:18.000000000 +0200
++++ vilistextum-2.6.7-gentoo/INSTALL	2004-12-22 21:49:20.000000000 +0100
+@@ -11,7 +11,7 @@
+ Multibyte/Unicode version
+ =========================
+ 
+-./configure --enable && make && make install
++./configure --enable-multibyte && make && make install
+ 
+ The multibyte version needs libiconv.
+ http://www.gnu.org/software/libiconv
+diff -uwr vilistextum-2.6.7/config.h.in vilistextum-2.6.7-gentoo/config.h.in
+--- vilistextum-2.6.7/config.h.in	2004-12-20 00:05:48.000000000 +0100
++++ vilistextum-2.6.7-gentoo/config.h.in	2005-01-02 09:14:59.000000000 +0100
+@@ -3,6 +3,9 @@
+ /* Define to 1 if you have the <getopt.h> header file. */
+ #undef HAVE_GETOPT_H
+ 
++/* Define to 1 if you have the <iconv.h> header file. */
++#undef HAVE_ICONV_H
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+diff -uwr vilistextum-2.6.7/configure vilistextum-2.6.7-gentoo/configure
+--- vilistextum-2.6.7/configure	2004-12-20 00:05:32.000000000 +0100
++++ vilistextum-2.6.7-gentoo/configure	2005-01-02 09:13:56.000000000 +0100
+@@ -846,7 +846,7 @@
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors
+-  --enable-multibyte      Enable multibyte support. Needs libiconv.
++  --enable-multibyte      Enable multibyte support.
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -1541,7 +1541,7 @@
+ 
+ # Define the identity of the package.
+  PACKAGE=vilistextum
+- VERSION=2.6.7
++ VERSION=2.6.7-gentoo
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -1673,7 +1673,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define RELEASEDATE "19.12.2004"
++#define RELEASEDATE "02.01.2005"
+ _ACEOF
+ 
+ 
+@@ -3615,13 +3615,14 @@
+ # Check whether --enable-multibyte or --disable-multibyte was given.
+ if test "${enable_multibyte+set}" = set; then
+   enableval="$enable_multibyte"
+-  multibyte="yes"
++  use_multibyte=$enableval
+ else
+-  multibyte="no"
++  use_multibyte=no
+ fi;
+-echo "$as_me:$LINENO: result: $multibyte" >&5
+-echo "${ECHO_T}$multibyte" >&6
+-if test "$multibyte" = "yes"; then
++echo "$as_me:$LINENO: result: $use_multibyte" >&5
++echo "${ECHO_T}$use_multibyte" >&6
++
++if test "$use_multibyte" = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define MULTIBYTE 1
+@@ -3629,7 +3630,154 @@
+ 
+ fi
+ 
+-if test "$multibyte" = "yes"; then
++if test "$use_multibyte" = "yes"; then
++
++for ac_header in iconv.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc in
++  yes:no )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++  no:yes )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf@gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++else
++  { { echo "$as_me:$LINENO: error: Need libiconv or iconv.h for multibyte support" >&5
++echo "$as_me: error: Need libiconv or iconv.h for multibyte support" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++done
++
++
+ 
+ echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
+ echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
+@@ -3693,9 +3841,8 @@
+   LIBS="-liconv $LIBS"
+ 
+ else
+-  { { echo "$as_me:$LINENO: error: Need libiconv for multibyte support" >&5
+-echo "$as_me: error: Need libiconv for multibyte support" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "$as_me:$LINENO: WARNING: only generic iconv has been found not libiconv" >&5
++echo "$as_me: WARNING: only generic iconv has been found not libiconv" >&2;}
+ fi
+ 
+ 
+diff -uwr vilistextum-2.6.7/configure.in vilistextum-2.6.7-gentoo/configure.in
+--- vilistextum-2.6.7/configure.in	2004-12-20 00:05:14.000000000 +0100
++++ vilistextum-2.6.7-gentoo/configure.in	2005-01-02 09:13:30.000000000 +0100
+@@ -1,11 +1,11 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/debug.h)
+-AM_INIT_AUTOMAKE(vilistextum, 2.6.7)
++AM_INIT_AUTOMAKE(vilistextum, 2.6.7-gentoo)
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
+ dnl Set current date
+-AC_DEFINE_UNQUOTED(RELEASEDATE, "19.12.2004", "Release date of the program")
++AC_DEFINE_UNQUOTED(RELEASEDATE, "02.01.2005", "Release date of the program")
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -27,17 +27,21 @@
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+-        [  --enable-multibyte      Enable multibyte support. Needs libiconv.],
+-        [multibyte="yes"], [multibyte="no"])
+-AC_MSG_RESULT($multibyte)
+-if test "$multibyte" = "yes"; then
++  AC_HELP_STRING([--enable-multibyte], [Enable multibyte support.]),
++  [use_multibyte=$enableval], [use_multibyte=no])
++AC_MSG_RESULT($use_multibyte)
++
++if test "$use_multibyte" = "yes"; then
+         AC_DEFINE(MULTIBYTE, 1, "Enable multibyte support (e.g. unicode, shift_jis)")
+ fi
+ 
+ dnl Checks for libraries.
+-if test "$multibyte" = "yes"; then
++if test "$use_multibyte" = "yes"; then
++AC_CHECK_HEADERS(iconv.h,,
++			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
++
+ 	AC_CHECK_LIB(iconv, iconv,,
+-		AC_MSG_ERROR(Need libiconv for multibyte support))
++			AC_MSG_WARN(only generic iconv has been found not libiconv))
+ 
+ dnl setting INTERNAL_LOCALE
+ AC_MSG_CHECKING(for unicode locale)
+diff -uwr vilistextum-2.6.7/src/fileio.c vilistextum-2.6.7-gentoo/src/fileio.c
+--- vilistextum-2.6.7/src/fileio.c	2004-12-19 22:08:08.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/fileio.c	2004-12-22 21:29:34.000000000 +0100
+@@ -27,11 +27,6 @@
+ #ifdef MULTIBYTE
+   #include <iconv.h>
+   #include <locale.h>
+-  #if defined(__sun__)
+-    #include <libcharset.h>
+-  #else
+-    #include <localcharset.h>
+-  #endif
+ #endif
+ 
+ FILE *in, *out;
+@@ -74,32 +69,42 @@
+ 	char *inp, *outp;
+ 	int fehlernr=0;
+ 	size_t insize, outsize;
++	char *ret;
+ 
+ 	/* set locale based on environment variables */
+-	setlocale(LC_CTYPE, "");
++	ret = setlocale(LC_CTYPE, "");
++  if (ret==NULL) { 
++		fprintf(stderr, "setlocale failed with: %s\n\n", getenv("LC_CTYPE"));
++		exit(1);
++	}
+ 
+ 	insize = strlen(str);
++	if (insize > DEF_STR_LEN) { insize = DEF_STR_LEN; }
+ 	outsize = DEF_STR_LEN;
+ 
+ 	inp = str;
+ 	outp = output;
+ 
+ 	if ((conv = iconv_open("utf-8", "char"))==(iconv_t)(-1))
+-		{	printf("iconv_open failed in convert_string: Can't convert from %s to UTF-8?\n", locale_charset()); exit(1); }
++		{	printf("iconv_open failed in convert_string: Can't convert from %s to UTF-8?\n", getenv("LC_CTYPE")); exit(1); }
+ 
+ 	result = iconv(conv, &inp, &insize, &outp, &outsize);
+ 	fehlernr = errno;
+ 
+ 	if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
+ 	else if (fehlernr==EILSEQ) { 
+-		fprintf(stderr, "Can't convert '%s' as character set %s\n", str, locale_charset());
++		fprintf(stderr, "Can't interpret '%s' as character from charset %s\n", str, getenv("LC_CTYPE"));
+ 		fprintf(stderr, "Check your language settings with locale(1)\n");
+ 	}
+ 	else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
+ 		
+ 	output[strlen(output)] = '\0';
+ 
+-	setlocale(LC_CTYPE, INTERNAL_LOCALE);
++	ret = setlocale(LC_CTYPE, INTERNAL_LOCALE);
++  if (ret==NULL) { 
++		fprintf(stderr, "setlocale failed with: %s\n\n", INTERNAL_LOCALE);
++		exit(1);
++	}
+ 	mbstowcs(converted_string, output, strlen(output));
+ 
+ 	iconv_close(conv);
+@@ -141,7 +146,7 @@
+ 		fehlernr = errno;
+ 
+ 		if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
+-		else if (fehlernr==EILSEQ) { fprintf(stderr, "errno==EILSEQ in output_string\n"); }
++		else if (fehlernr==EILSEQ) { fprintf(stderr, "errno==EILSEQ in output_string\n"); fprintf(stderr, "input: %s\n", inp); }
+ 		else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
+ 		
+ 		output[DEF_STR_LEN-outsize] = '\0';
+diff -uwr vilistextum-2.6.7/src/html.c vilistextum-2.6.7-gentoo/src/html.c
+--- vilistextum-2.6.7/src/html.c	2004-12-19 22:08:17.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/html.c	2004-12-22 17:19:37.000000000 +0100
+@@ -95,9 +95,8 @@
+ 	while ((ch!='=') && (ch!='>')) {
+ 		ch=read_char();
+ 		if (i<DEF_STR_LEN) { attr_name[i++] = ch; }
+-	}
+-  if (i<DEF_STR_LEN) { attr_name[i-1] = '\0'; }
+-	else { attr_name[DEF_STR_LEN-1] = '\0'; }
++	} /* post cond: i<=DEF_STR_LEN */
++	attr_name[i-1] = '\0';
+ 	
+   if (ch=='>') { attr_ctnt[0]='\0'; return '>'; }
+ 
+@@ -116,11 +115,10 @@
+     i=0;
+     ch=read_char();
+     while(quote!=ch) {
+-			if (i<DEF_STR_LEN) { temp[i++] = ch; }
++			if (i<DEF_STR_LEN-1) { temp[i++] = ch; }
+ 			ch=read_char(); 
+-		}
+-		if (i<DEF_STR_LEN) { temp[i] = '\0'; }
+-    else { temp[DEF_STR_LEN] = '\0'; }
++		} /* post cond: i<=DEF_STR_LEN-1 */
++		temp[i] = '\0';
+     ch=read_char();
+   }
+   else
+@@ -131,9 +129,8 @@
+     while ((ch!='>') && (!isspace(ch))) {
+ 			ch=read_char();
+ 			if (i<DEF_STR_LEN) { temp[i++] = ch; }
+-		}
+-		if (i<DEF_STR_LEN) { temp[i-1] = '\0'; }
+-    else { temp[DEF_STR_LEN-1] = '\0'; }
++		} /* post cond: i<=DEF_STR_LEN */
++		temp[i-1] = '\0';
+   }
+ 
+ 	uppercase_str(attr_name);
+diff -uwr vilistextum-2.6.7/src/html_tag.c vilistextum-2.6.7-gentoo/src/html_tag.c
+--- vilistextum-2.6.7/src/html_tag.c	2004-12-19 22:08:20.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/html_tag.c	2004-12-22 17:23:09.000000000 +0100
+@@ -52,12 +52,10 @@
+ 	/* read html tag */
+   while ((ch!='>') && (ch!=' ') && (ch!=13) && (ch!=10))
+   {
+-    if (i<DEF_STR_LEN) { str[i] = ch; }
+-		i++;
++    if (i<DEF_STR_LEN-1) { str[i++] = ch; }
+     ch = uppercase(read_char());
+-  }
+-	if (i>=DEF_STR_LEN) { str[DEF_STR_LEN] = '\0'; }
+-	else { str[i] = '\0';}
++  } /* post cond: i<=DEF_STR_LEN-1 */
++	str[i] = '\0';
+ 
+ #ifdef debug
+   fprintf(stderr, "html_tag: %ls\n",str);
+@@ -332,6 +330,8 @@
+ 		else if CMP("/SCRIPT", str)   {}
+ 		else if CMP("STYLE", str)     {}
+ 		else if CMP("/STYLE", str)    {}
++		else if CMP("TITLE", str)     {}
++		else if CMP("/TITLE", str)    {}
+ 		else { if (errorlevel>=2) { print_error("tag ignored: ", str);} } 
+ 	}
+ 
+diff -uwr vilistextum-2.6.7/src/main.c vilistextum-2.6.7-gentoo/src/main.c
+--- vilistextum-2.6.7/src/main.c	2004-12-19 22:08:30.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/main.c	2004-12-22 17:16:05.000000000 +0100
+@@ -253,7 +253,7 @@
+ 		case 's': 
+ 			shrink_lines = atoi(argument); if (shrink_lines==0) { shrink_lines = 1; } break;
+ 
+-		case 'r': remove_empty_alt = 1; /* printf("remove_empty_alt\n"); */ break;
++		case 'r': remove_empty_alt = 1; break;
+ 		case 'i': 
+ #ifdef MULTIBYTE
+ 			convert_string(argument, user_image);
+diff -uwr vilistextum-2.6.7/src/text.c vilistextum-2.6.7-gentoo/src/text.c
+--- vilistextum-2.6.7/src/text.c	2004-12-19 22:08:41.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/text.c	2004-12-22 15:43:26.000000000 +0100
+@@ -249,10 +249,12 @@
+ 
+   if (!palm)
+   {
++		if (wort_pos+len<DEF_STR_LEN) {
+     while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }
+     wort[i] = '\0';
+     wort_pos += len;
+   }
++  }
+ 
+ #ifdef proc_debug
+   printf("wort_plus_string_nocount() ende\n");
+@@ -273,9 +275,11 @@
+   printf("s: %ls len: %d\n", s,len);
+ #endif
+ 
++	if (wort_pos+len<DEF_STR_LEN) {
+   while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }
+   wort[i] = '\0';
+   wort_pos += len; wort_len += len;
++	}
+ 
+ #ifdef proc_debug
+   printf("wort_plus_string() ende\n");
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..f23b9cae1593
--- /dev/null
+++ b/app-text/vilistextum/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+</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..37d6d7338e90
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Html to ascii converter specifically programmed to get the best out of 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..de99ad589778
--- /dev/null
+++ b/app-text/vlna/Manifest
@@ -0,0 +1 @@
+DIST vlna-1.5.tar.gz 146670 SHA256 0d79955ec138760fa48dcddd73ed0bac4a81d31e99cb8929a05550373b4f4bfb SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2 WHIRLPOOL 4ab10788a600f6d1b103dda38320b0054e544c08d6c28ed4af601a32f797438f60d054d6c5a1bca4c23e89a5a1616bb2329f7930199f8f9732f4abaff42bfdb6
diff --git a/app-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
new file mode 100644
index 000000000000..040f708c8404
--- /dev/null
+++ b/app-text/vlna/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+  <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>
+</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..57fbc1970302
--- /dev/null
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..5dc16e679930
--- /dev/null
+++ b/app-text/wdiff/Manifest
@@ -0,0 +1 @@
+DIST wdiff-1.2.2.tar.gz 1478567 SHA256 34ff698c870c87e6e47a838eeaaae729fa73349139fc8db12211d2a22b78af6b SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed WHIRLPOOL 39bff8de5fcb0b98ba18a636d57ccde0e422c2ecddac5a4623fef03cad0a92c68ccb25272a9b0fefdb6b109c5354ce201be317f293e07f18592f3214049cafe7
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
new file mode 100644
index 000000000000..4fb185fbe049
--- /dev/null
+++ b/app-text/wdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <use>
+    <flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
+  </use>
+</pkgmetadata>
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..ed6f19f040f2
--- /dev/null
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Create a diff disregarding formatting"
+HOMEPAGE="http://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..04ad790cea12
--- /dev/null
+++ b/app-text/webgen/Manifest
@@ -0,0 +1 @@
+DIST webgen-1.3.0.gem 198656 SHA256 0e50e515d1cd0f07b8d1bb72735b7a8fa162906d36541f9bcf10c41d2b1695a6 SHA512 921ffe9788ccf719eab7e8225b328990762ff04e928fbc699d4ab40170b437b54fe526887fd0de7209c6b7c2f50e0791ffe88eaebd73f77ef5a3df4c2235ba11 WHIRLPOOL be0bc1d3d1189847548b4aae83811d5f429badb724d21f5880c67d06d4ca21b7ca668c02f3b879344a123e5f2ed9f0cd949ab4c2c99002e0444360c09ddecb9b
diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
new file mode 100644
index 000000000000..afcfd85ce233
--- /dev/null
+++ b/app-text/webgen/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><email>maintainer-needed@gentoo.org</email></maintainer>
+  <herd>ruby</herd>
+  <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.3.0.ebuild b/app-text/webgen/webgen-1.3.0.ebuild
new file mode 100644
index 000000000000..32408b27e5a5
--- /dev/null
+++ b/app-text/webgen/webgen-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+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-2.0.0:0
+	dev-ruby/systemu
+	dev-ruby/kramdown
+	builder? ( >=dev-ruby/builder-2.1.0 )
+	highlight? ( >=dev-ruby/coderay-0.8.312 )
+	markdown? ( dev-ruby/maruku )"
+
+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..05ef13a84729
--- /dev/null
+++ b/app-text/wgetpaste/Manifest
@@ -0,0 +1,2 @@
+DIST wgetpaste-2.22.tar.bz2 10842 SHA256 a903d4b93e487046226ad77037a28cb5f6cf2465bf212e5edf568c4135f6fe05 SHA512 4a9fd56b1d4924a863d10af38721469ac0116cb05b5e5e79f5ecf149ba2af69acf79a30bc66450b9363b2fa7116b20222073dc8d7bc1e7dbab79981e6ce80396 WHIRLPOOL c25fc58c0e0a01b0960ebb07e270c7c8136d1589f16eae9c1e94c614260b479abdbf5255d60d9ebe477c5acd201f0e598f69a3501cd127fb7f42e9a80b443d77
+DIST wgetpaste-2.25.tar.bz2 11107 SHA256 6a7e078e6607f4fe819fc52857a601630ec0f7d2ee855d3b1cd7e75a904c40f4 SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e WHIRLPOOL ad64e1d45cb49dd70a2b33e49e81f255b304def9e4b8d8c29ac4b4161fb7cc290574686a0488a731cd36f339fde0f78da90ad439f1b771b8d5bd2f2df9cd67c3
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..2930d0a63a2c
--- /dev/null
+++ b/app-text/wgetpaste/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>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="lodgeit-default">Set one of lodgeit-like (ex http://paste.pocoo.org) services as default</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/wgetpaste/wgetpaste-2.22.ebuild b/app-text/wgetpaste/wgetpaste-2.22.ebuild
new file mode 100644
index 000000000000..b6d9bba8f03a
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.22.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+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 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="zsh-completion +lodgeit-default"
+
+DEPEND=""
+RDEPEND="net-misc/wget
+	zsh-completion? ( app-shells/zsh )"
+
+src_prepare() {
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/wgetpaste.d
+	newins "${FILESDIR}"/wgetpaste-config-services services.conf
+	use lodgeit-default && \
+		newins "${FILESDIR}"/wgetpaste-config-default-lodgeit gentoo-default.conf
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins _wgetpaste
+	fi
+}
diff --git a/app-text/wgetpaste/wgetpaste-2.25-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r2.ebuild
new file mode 100644
index 000000000000..d4896c86e38d
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.25-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~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
+}
+
+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.25-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
new file mode 100644
index 000000000000..05dfdf9e5edf
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~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/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
new file mode 100644
index 000000000000..35261c519f6a
--- /dev/null
+++ b/app-text/wiki2beamer/Manifest
@@ -0,0 +1 @@
+DIST wiki2beamer-0.9.5.zip 443288 SHA256 d38f1d53896fb09e5fed4bafccbdcfd73d7207dfc8c84709d442d4910a32f4cc SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7 WHIRLPOOL 2973234d59131ca8531d65d1bca0f2c417b82ddd012dbd709488961583f866b3e8c83fa2927cabe1c509777683a8b6ecb8abb57d1dde8ae9766f545225d938aa
diff --git a/app-text/wiki2beamer/metadata.xml b/app-text/wiki2beamer/metadata.xml
new file mode 100644
index 000000000000..7cc1110bdf78
--- /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>
+		<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..b695000a2ec5
--- /dev/null
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+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..0171f6879c70
--- /dev/null
+++ b/app-text/winefish/Manifest
@@ -0,0 +1 @@
+DIST winefish-1.3.3.tgz 478063 SHA256 b61a7edf954b0314695a3fc09b3780602d331b676e8ccea5b0aabe0427f6b7c7 SHA512 bc357d01d23ad5eed71e77754804201d0e13be20d6b9338b63b0599aeb174e9d1828f94251755c14494f135a3f53b76614c4a9fcc06467b49a04e07123c557ec WHIRLPOOL cc689a8a2904f938557dae8c79009664ed09da166be651b193d9487a89e0248ce07ebb7bf7016fb8be4c6daf8cd1451f3ecd6458d457e75d47b30d467b11985f
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..b1118ebfc4d4
--- /dev/null
+++ b/app-text/winefish/files/winefish-1.3.3-nostrip.patch
@@ -0,0 +1,13 @@
+Index: winefish-1.3.3/src/Makefile.in
+===================================================================
+--- winefish-1.3.3.orig/src/Makefile.in
++++ winefish-1.3.3/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/metadata.xml b/app-text/winefish/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/winefish/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>
diff --git a/app-text/winefish/winefish-1.3.3-r1.ebuild b/app-text/winefish/winefish-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..372c9d208b13
--- /dev/null
+++ b/app-text/winefish/winefish-1.3.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils fdo-mime
+
+MY_PV=${PV/%[[:alpha:]]/}
+
+DESCRIPTION="LaTeX editor based on Bluefish"
+HOMEPAGE="http://winefish.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="spell"
+
+RDEPEND=">=x11-libs/gtk+-2.4:2
+	>=dev-libs/libpcre-6.3
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+}
+
+src_configure() {
+	econf --disable-update-databases
+}
+
+src_install() {
+	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html || die "emake install failed"
+	dodoc AUTHORS CHANGES README ROADMAP THANKS TODO
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	elog "You need to emerge a TeX distribution to gain winefish's full capacity"
+}
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
new file mode 100644
index 000000000000..9c0fdd708c83
--- /dev/null
+++ b/app-text/wklej/Manifest
@@ -0,0 +1,2 @@
+DIST wklej-0.2.0.tar.gz 4356 SHA256 ba522500a0b48515498c98c9859f171893dd7bddc35e26e80adaa73ee8da8fe5 SHA512 5ae06c2aa09bb4ef84244efad46291f77fbbb01440d5369d25161112db18e2991cb6f7bfe49029aaef818d585be0a5a309e384419da23957e87b1613d43aaee5 WHIRLPOOL e605336dca7d4c874e6b6657cef8c7a05c3d233a82acbd8250c7f809f0353e1748b828bf63fca47e51d942ff47e82707c35d544e85397625fa6c00e698379faf
+DIST wklej-0.2.1.tar.gz 4370 SHA256 6b907351b3c10f70e847d0d761615e2b37f09696ad019da583325e6c17524dd1 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c WHIRLPOOL 8beda97607353bbfbd6e10a1ec91c060db42b74f258020eca9a4160e9f9a3197b9e936763ac37d7083b44b732f9ac64885c3d5445876d7ae404f0790a97b1351
diff --git a/app-text/wklej/metadata.xml b/app-text/wklej/metadata.xml
new file mode 100644
index 000000000000..68cf49966571
--- /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>
+	<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.0.ebuild b/app-text/wklej/wklej-0.2.0.ebuild
new file mode 100644
index 000000000000..1660648123e6
--- /dev/null
+++ b/app-text/wklej/wklej-0.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="*:2.6"
+inherit eutils python
+
+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"
+
+DEPEND=""
+RDEPEND="vim? ( app-editors/vim[python] )"
+
+S=${WORKDIR}
+
+src_install() {
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins ${PN}.vim || die "Failed to install vim plugin"
+	fi
+
+	dobin ${PN} || die "Failed to install ${PN} script"
+	dodoc README wklejrc || die "Failed to install readme"
+}
+
+pkg_postinst() {
+	elog "There are lots of changes in ${PV} version"
+	elog "Check out the documents in /usr/share/doc/${PF}"
+}
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..fc5e8469cdc0
--- /dev/null
+++ b/app-text/wklej/wklej-0.2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} 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"
+
+DEPEND=""
+RDEPEND="vim? ( app-editors/vim[python,$(python_gen_usedep 'python2*')] )"
+
+# the vim script works is python2-only...
+REQUIRED_USE="vim? ( ^^ ( $(python_gen_useflags '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..83e67dae1ef6
--- /dev/null
+++ b/app-text/writerperfect/Manifest
@@ -0,0 +1,5 @@
+DIST writerperfect-0.8.1.tar.xz 249728 SHA256 87a4d6a0bf1743557336969c87c1955c7532b6e2fe4cc925653d7e16bae8e327 SHA512 a2df89ffdad454a800b1df28442403802ba67b1a76b5bfacc809f4798501988a1aecf63eccf10d395019021008fa0aad82fba090be06b99c52e5bfa0df21cccc WHIRLPOOL ffaae317a0fcf89f68f9bfce823cbfa4bd70e8426f81a228a129bccd234666eba435be598fc3559bfe303e3473891998fbebfe8d437709ad462b5e2ce5f2129b
+DIST writerperfect-0.8.2.tar.xz 261984 SHA256 12291dd0c7a77b16544905846ce8d6eb328e728bd5153dbdb6ad3003beb49dbc SHA512 4432e9a7cb78d687fd7b1cf287a88bc752d29b0364f8c2615b2a8b3ca8376437ff44800013646af7d4c8904810145752e9eddc8e01f036041ff4de192348ce0b WHIRLPOOL fa529da7535cd6ec7744137af16fdc9166b9b270af5c75b1a13538f3345c61256035272b310e484ed5070677e28ad8b7871d9eb7f1d0d92d5b2943063f7723c7
+DIST writerperfect-0.9.2.tar.xz 274760 SHA256 e4040ec20436d5a763632243787bbb86cffd82ddf0da6aa674827e0401c2b601 SHA512 07679176c9c3f159c177cae65d499550f5cf86b34af26d32fb1d445176a3a8ff773c48b677cbbaa3514b81f5c5e83a358f8ba1ab0b567e182aeb05d8a4fc8bcb WHIRLPOOL 5bee7d9ac16ff74e2c70093a629ae0d417e7e3cd71b7a78bbdb5f62c1d9a7ea46962ba0816742b38937d3b2907d9b7a6f888c95e4da20e7bc4f736702a844dcf
+DIST writerperfect-0.9.3.tar.xz 297192 SHA256 1dceacd627459b6375d956a10b3c8ac4c3a8e8f68d36ebc968d26af83d824883 SHA512 2f60ba509e983a79a4c8450bcbffaa93ef59b9f890aa772cc70ce57ccf976b50551c354bab647c5fec11798864d88f12a62fc28e5d109cd9738c4369060e742c WHIRLPOOL edc21b8b281d34116a6b694875034e654c0c187db4c7731a878a8b2c9f383a987d14e4d61ae353b2f82261eb76888deebfa3290bdfeb04a996f02f4eb55a4ced
+DIST writerperfect-0.9.4.tar.xz 288092 SHA256 6714bf945a657550eb84bd2f1f0b78b894f59536d8302942810134426f7a23ea SHA512 9bb180e9b681687145a129c0abab41d1cbd7db874d393fff2ed3a65f64b94cc3a104c32889fcab2739aaaad791d7f109a48e4b1e7ae0b5577505df7069cefc64 WHIRLPOOL bc56d1a28e2589426fb439feeebf2667b1839fcabf1094ca0dbe5913bd1db80c51f205152151dcf1866a11b3478478b7fabbef10136447126d995222d4019b6b
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
new file mode 100644
index 000000000000..41d06371d35c
--- /dev/null
+++ b/app-text/writerperfect/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>openoffice</herd>
+	<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.8.1.ebuild b/app-text/writerperfect/writerperfect-0.8.1.ebuild
new file mode 100644
index 000000000000..a65d5ce4ba00
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Various formats to Open document format converter"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/writerperfect-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="debug gsf +visio +wpg +wps"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	gsf? ( gnome-extra/libgsf )
+	visio? ( media-libs/libvisio )
+	wpg? ( app-text/libwpg:0.2 )
+	wps? ( =app-text/libwps-0.2* )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/writerperfect-${PV}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with gsf libgsf) \
+		$(use_with wpg libwpg) \
+		$(use_with wps libwps) \
+		$(use_with visio libvisio)
+}
diff --git a/app-text/writerperfect/writerperfect-0.8.2.ebuild b/app-text/writerperfect/writerperfect-0.8.2.ebuild
new file mode 100644
index 000000000000..b1aec47004b5
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.8.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="+cdr debug gsf +mspub +mwaw +visio +wps"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	=app-text/libodfgen-0.0*
+	cdr? ( media-libs/libcdr )
+	gsf? ( gnome-extra/libgsf )
+	mspub? ( app-text/libmspub )
+	mwaw? ( =app-text/libmwaw-0.1* )
+	visio? ( media-libs/libvisio )
+	wps? ( =app-text/libwps-0.2* )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with gsf libgsf) \
+		$(use_with wps libwps) \
+		$(use_with visio libvisio) \
+		$(use_with cdr libcdr) \
+		$(use_with mspub libmspub) \
+		$(use_with mwaw libmwaw)
+}
diff --git a/app-text/writerperfect/writerperfect-0.9.2.ebuild b/app-text/writerperfect/writerperfect-0.9.2.ebuild
new file mode 100644
index 000000000000..401153175f3c
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.9.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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
+RDEPEND="
+	=app-text/libodfgen-0.1*
+	>=dev-libs/librevenge-0.0.1
+	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.3* )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with abiword libabw) \
+		$(use_with cdr libcdr) \
+		$(use_with ebook libe-book) \
+		$(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/writerperfect/writerperfect-0.9.3.ebuild b/app-text/writerperfect/writerperfect-0.9.3.ebuild
new file mode 100644
index 000000000000..3d748f6a2d13
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.9.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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, libeot, librvngabw
+RDEPEND="
+	=app-text/libodfgen-0.1*
+	>=dev-libs/librevenge-0.0.1
+	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
+"
+
+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/writerperfect/writerperfect-0.9.4.ebuild b/app-text/writerperfect/writerperfect-0.9.4.ebuild
new file mode 100644
index 000000000000..3d748f6a2d13
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.9.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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, libeot, librvngabw
+RDEPEND="
+	=app-text/libodfgen-0.1*
+	>=dev-libs/librevenge-0.0.1
+	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
+"
+
+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..c323964b4895
--- /dev/null
+++ b/app-text/wscr/Manifest
@@ -0,0 +1 @@
+DIST wscr-1.2.tar.gz 3502 SHA256 00b69d95cbd5c4e0f6fe63c991d5b01bc8cdbd3b03c7faa1fa93738fc091d49b SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3 WHIRLPOOL 2fbe0796373ac373887e2a00c079fba0e7110ec346d80000e5dd34ea92f9c571cf09f45e02b075dcd5cbc50fce80ef2bb7422cd41000325ad731341596ead2e4
diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
new file mode 100644
index 000000000000..8ee40597ee2e
--- /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>
+<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..8ba24062d0df
--- /dev/null
+++ b/app-text/wscr/wscr-1.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A Lightweight and Fast Anagram Solver"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://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..a2966978a65f
--- /dev/null
+++ b/app-text/wv/Manifest
@@ -0,0 +1 @@
+DIST wv-1.2.9.tar.gz 616256 SHA256 4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5 WHIRLPOOL 9314e639de72cfdef391990b664137dd2b5d6b9b536b317150e02f6508f4499ec335f774037d42cae22ff6192e2b52ce8ac8be08b1aec759c1357568f6fcfc8d
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
new file mode 100644
index 000000000000..cebb8ad815ae
--- /dev/null
+++ b/app-text/wv/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use><flag name="tools">Install optional utilities considered deprecated in favor of using AbiWord.</flag></use>
+</pkgmetadata>
diff --git a/app-text/wv/wv-1.2.9-r1.ebuild b/app-text/wv/wv-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..57f90791b924
--- /dev/null
+++ b/app-text/wv/wv-1.2.9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils autotools multilib
+
+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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-extra/libgsf-1.13
+	sys-libs/zlib
+	media-libs/libpng
+	dev-libs/libxml2
+	tools? ( app-text/texlive-core
+		 dev-texlive/texlive-latex )
+	wmf? ( >=media-libs/libwmf-0.2.2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	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 $(use_with wmf libwmf)
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libwv-1.2.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libwv-1.2.so.3
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "Installation failed"
+	dodoc README NEWS || die
+
+	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..64b7a52b4571
--- /dev/null
+++ b/app-text/wv2/Manifest
@@ -0,0 +1 @@
+DIST wv2-0.4.2.tar.bz2 452759 SHA256 9f2b6d3910cb0e29c9ff432f935a594ceec0101bca46ba2fc251aff251ee38dc SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b WHIRLPOOL 75dd1936ca794bfcdfe69e009b2f7a77f8bf7e7a4270f0dc1b23255232cf235508311bd93c91a10075ef54b6a4149b045548f5fc7587d48d44af7ee1d61f5e2e
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..4596f25b9cb5
--- /dev/null
+++ b/app-text/wv2/files/wv2-0.4.2-glib.patch
@@ -0,0 +1,12 @@
+From: http://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..f931fd09f05a
--- /dev/null
+++ b/app-text/wv2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>tex</herd>
+	<upstream>
+		<remote-id type="sourceforge">wvware</remote-id>
+		<bugs-to>http://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..10e4c909172f
--- /dev/null
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..165c74e9890e
--- /dev/null
+++ b/app-text/xapian-omega/Manifest
@@ -0,0 +1,5 @@
+DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
+DIST xapian-omega-1.2.20.tar.xz 420488 SHA256 41f00ef7e650d10702d87b089a0103554ca3f038acc66df1bdbf852bb1d87fb9 SHA512 187b4d3a918f3b02b0a1737baedfff253455b16f3fd1b47ed3d93c4f53b41657d001929efc716467eefeb6daa437d1b530681ed250f8d665e86eedf7d0737756 WHIRLPOOL 65ea58a8743f4472e7242a20e4170782765f60e62ce8157341e7cfbf2ccbabd702262edfdd5cffb0c4562d50703235a7a235a1d03ef62453aae4e6405b69c606
+DIST xapian-omega-1.2.21.tar.xz 435624 SHA256 862d3a5d7052fc13c16eed51c42d774c4ab1c56967c477d994995b753dc9527e SHA512 8aa669fbf3253b72e742bed93a9ec972e33f49327cf0e912a21b33e3f586cf35041a50f107fe4767f8906996e86f8a6126efc8232e72045e8243b0ab1b30e1e9 WHIRLPOOL 8a6b555ef6eeacbca24b2c80468b3195eacc66084243d0340709a6c556cb03009022b8716b5e2aef0f6c382aaf5dbec8f29a01589808170fa26e73ccc988bdff
+DIST xapian-omega-1.3.2.tar.xz 449872 SHA256 951434ffa95651607589fcdde6548cbdd1b67dde264aa34234c293690fb7fc0d SHA512 92e9c58206fba424f92d88fa7a36fe21d350de0c0cd71857ff1db3c423dd40b4e7d5e331d13de3b905907b0d9a549d2888cdcd3125ece52452e7c304d2f437a0 WHIRLPOOL 0473913bb8c9752859d15a92159d250e3ef585331ccfb2eaea805670c3629a86e3091849067eeb0541fc1b23be2db5c8a5b7f9c73e49fc2fa35a54f6faa66782
+DIST xapian-omega-1.3.3.tar.xz 464308 SHA256 d28c05d5c920dae142fe69abec074b7916f027d749d2d0290d04133d2d6ad6f0 SHA512 4ea980b96526e1bc88329991e34b174944c8f87ba1b0d0f199bb2c7545ce80bc5307935d8322b6e8fa48b28dc6ead728fc5bebe7e13758602f952eac60302dd5 WHIRLPOOL b748a27225d097e3dca6d25935cbc40da5905795efc302affe13a3ba015b5fc1c15eef69e4d0ea460378f7aac6cce5896073ebb6856d46d6651a97bd626d3a39
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
new file mode 100644
index 000000000000..0441f1355104
--- /dev/null
+++ b/app-text/xapian-omega/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer>
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/xapian-omega/xapian-omega-1.2.19.ebuild b/app-text/xapian-omega/xapian-omega-1.2.19.ebuild
new file mode 100644
index 000000000000..9c8bc2cd9ccf
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-${PV}
+	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.20.ebuild b/app-text/xapian-omega/xapian-omega-1.2.20.ebuild
new file mode 100644
index 000000000000..83c32bf2ce37
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.20.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-${PV}
+	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.21.ebuild b/app-text/xapian-omega/xapian-omega-1.2.21.ebuild
new file mode 100644
index 000000000000..83c32bf2ce37
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.21.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-${PV}
+	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.3.2.ebuild b/app-text/xapian-omega/xapian-omega-1.3.2.ebuild
new file mode 100644
index 000000000000..e4503526ca5c
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/xapian-${PV}
+	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.3.3.ebuild b/app-text/xapian-omega/xapian-omega-1.3.3.ebuild
new file mode 100644
index 000000000000..e4503526ca5c
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/xapian-${PV}
+	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/xchm/Manifest b/app-text/xchm/Manifest
new file mode 100644
index 000000000000..cc0e7920cb11
--- /dev/null
+++ b/app-text/xchm/Manifest
@@ -0,0 +1 @@
+DIST xchm-1.23.tar.gz 474274 SHA256 8f8f5c60954f340e50f1613913eaca6ff489c10ca36b2570b360d8ccba77c062 SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90 WHIRLPOOL e5d7528032ac36713455df3f166dac31b6e55e868dd2360950006cff68168d944d8637dd480d0891696a9fb27139b05b91e80dc028c08f30c8cadf79ba34283a
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..7f7a22253038
--- /dev/null
+++ b/app-text/xchm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>rhill@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xchm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xchm/xchm-1.23.ebuild b/app-text/xchm/xchm-1.23.ebuild
new file mode 100644
index 000000000000..e08df15ee62d
--- /dev/null
+++ b/app-text/xchm/xchm-1.23.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+WX_GTK_VER="2.8"
+
+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:2.8[X]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	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/xdvik/Manifest b/app-text/xdvik/Manifest
new file mode 100644
index 000000000000..fb266ac326b5
--- /dev/null
+++ b/app-text/xdvik/Manifest
@@ -0,0 +1,3 @@
+DIST xdvik-22.85.tar.gz 4128828 SHA256 91f08103e53ab46efc83053e648bdd07aa100043233dadcb7384efc83fa2dde8 SHA512 9220bac0dea21d617b4ea7129ca8133fd447fb1adc26c699970cae7d3e168e32f4745b0936d18d8f769f3926c526e085f0c92a4d99d5faff8301e3c4ebc297b5 WHIRLPOOL 57ffc2d6a326b754b63aed54836c05b2e9431b01faba6d9bdc347b07094a62a7569d7746f556366b282808cc93a41a81cbda4fd82cdf4972133f8addc74e4e75
+DIST xdvik-22.86.tar.gz 4412419 SHA256 a3dffb8d878e6039ebc168d3bd82d194912dac53177673f818d0baac2dc27203 SHA512 f2cf15b8f94ae1a43b749fc9355eac1b427a41d690299ad4a221d51ef21eb0adcf6986c13f03d8c681e6cc2522229a2843b5c6f1ad359c5f0a28933e6d11c8eb WHIRLPOOL 8031f1ddc0eb8de415446752c07c0b7a22f35ffcd6f44a2b025cdb1bf1593bbe37306da5c93d620fe9f00b14fd6fc061c0f432afd7294ccf774e5e4e4fbd8f9d
+DIST xdvik-22.87.tar.gz 4600576 SHA256 920a20928b4360a1ab83843cffb98c129a54c6462ee014d0e5c4b209b8840ea7 SHA512 cb0c15e88ce42b25cd5edfc8fb84a8afdcc821a6444ba1c5f9f1365a7f62e57cbf37729b276de033b4abfd0f6fe32fa5789f6efd5a0c042e1195c4dc971c8b9f WHIRLPOOL 06ff8d6920ece92d711a432ed19998290f7bda30ad545b3c2bceb505f0fa3a03d680d6694f60a49c44d1b13b1429b45f6c451ec3f0d8f2723b74190065fc9417
diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript.patch
new file mode 100644
index 000000000000..356b2f1246e4
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.85-mksedscript.patch
@@ -0,0 +1,15 @@
+Index: texk/xdvik/mksedscript
+===================================================================
+--- texk/xdvik/mksedscript	(revision 25824)
++++ texk/xdvik/mksedscript	(revision 25826)
+@@ -43,7 +43,9 @@
+ 
+ # Get arguments from c-auto.h
+ 
+-eval "`awk '/^#define/ { print "mk_"$2"="$3 }' c-auto.h`"
++eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3
++  for (i = 4; i <= NF; i++) printf " %s", $i
++  print "" }' c-auto.h`"
+ 
+ # eval "`cat c-auto.h \
+ #   | grep '^[ 	]*#[ 	]*define[ 	]' \
diff --git a/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch b/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch
new file mode 100644
index 000000000000..69873731dd4e
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.85-mksedscript_gentoo.patch
@@ -0,0 +1,20 @@
+This used to eval something like:
+foo=char **
+so, the first match to * would be executed
+causing: https://bugs.gentoo.org/show_bug.cgi?id=410695
+
+remove the quotes and quote again so that we always get foo="char **"
+
+Index: xdvik-22.85/texk/xdvik/mksedscript
+===================================================================
+--- xdvik-22.85.orig/texk/xdvik/mksedscript
++++ xdvik-22.85/texk/xdvik/mksedscript
+@@ -45,7 +45,7 @@ done
+ 
+ eval "`awk '/^#define/ { printf "mk_%s=%s", $2, $3
+   for (i = 4; i <= NF; i++) printf " %s", $i
+-  print "" }' c-auto.h`"
++  print "" }' c-auto.h | tr -d '"' |sed -e 's/\(.*\)=\(.*\)$/\1="\2"/'`"
+ 
+ # eval "`cat c-auto.h \
+ #   | grep '^[ 	]*#[ 	]*define[ 	]' \
diff --git a/app-text/xdvik/files/xdvik-22.87-xaw3d.patch b/app-text/xdvik/files/xdvik-22.87-xaw3d.patch
new file mode 100644
index 000000000000..79e7893a19b8
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87-xaw3d.patch
@@ -0,0 +1,22 @@
+diff --git a/events.c b/events.c
+index dbb46f0..f9990f9 100644
+--- a/events.c
++++ b/events.c
+@@ -5311,7 +5311,7 @@ xi2_emulate_action(struct xdvi_action *actp, struct xi2_valinfo *valinfo,
+ 		}
+ 
+ 		if (actp->proc == Act_wheel) {
+-#  if XAW
++#  if !MOTIF
+ 		    if (globals.widgets.y_bar != NULL)
+ 			XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
+ 			  cast_int_to_XtPointer(dist));
+@@ -5322,7 +5322,7 @@ xi2_emulate_action(struct xdvi_action *actp, struct xi2_valinfo *valinfo,
+ #  endif /* MOTIF */
+ 		}
+ 		else {	/* Act_hwheel */
+-#  if XAW
++#  if !MOTIF
+ 		    if (globals.widgets.x_bar != NULL)
+ 			XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
+ 			  cast_int_to_XtPointer(dist));
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..1de599fc5b27
--- /dev/null
+++ b/app-text/xdvik/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<herd>tex</herd>
+	<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.85-r1.ebuild b/app-text/xdvik/xdvik-22.85-r1.ebuild
new file mode 100644
index 000000000000..2c6864d17064
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.85-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/t1lib-5.0.2
+	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
+	${RDEPEND}"
+RDEPEND="${RDEPEND}
+	virtual/latex-base
+	!<app-text/texlive-2007"
+TEXMF_PATH=/usr/share/texmf
+S=${WORKDIR}/${P}/texk/xdvik
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mksedscript.patch" \
+		"${FILESDIR}/${P}-mksedscript_gentoo.patch"
+	# 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() {
+	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-t1lib \
+		--with-system-kpathsea \
+		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+		--with-xdvi-x-toolkit="${toolkit}" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}"
+	use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodir /etc/texmf/xdvi /usr/share/X11/app-defaults
+	mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}usr/share/X11/app-defaults" || die "failed to move config file"
+	dosym {/usr/share/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi
+	for i in $(find "${ED}${TEXMF_PATH}/xdvi" -maxdepth 1 -type f) ; do
+		mv ${i} "${ED}etc/texmf/xdvi" || die "failed to move $i"
+		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i})
+	done
+
+	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() {
+	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
+}
diff --git a/app-text/xdvik/xdvik-22.86.ebuild b/app-text/xdvik/xdvik-22.86.ebuild
new file mode 100644
index 000000000000..0d43f34381d8
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.86.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/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
+	${RDEPEND}"
+RDEPEND="${RDEPEND}
+	virtual/latex-base
+	!<app-text/texlive-2007"
+S=${WORKDIR}/${P}/texk/xdvik
+
+src_prepare() {
+	# 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() {
+	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="${EPREFIX}"/usr/include \
+		--x-libraries="${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 /usr/share/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() {
+	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
+}
diff --git a/app-text/xdvik/xdvik-22.87.ebuild b/app-text/xdvik/xdvik-22.87.ebuild
new file mode 100644
index 000000000000..2c223876166e
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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
+	epatch "${FILESDIR}"/${P}-xaw3d.patch
+	# 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="${EPREFIX}"/usr/include \
+		--x-libraries="${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 /usr/share/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() {
+	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
+}
diff --git a/app-text/xdvipdfmx/Manifest b/app-text/xdvipdfmx/Manifest
new file mode 100644
index 000000000000..ac982646944e
--- /dev/null
+++ b/app-text/xdvipdfmx/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/xdvipdfmx/metadata.xml b/app-text/xdvipdfmx/metadata.xml
new file mode 100644
index 000000000000..5f5d6bb2fac8
--- /dev/null
+++ b/app-text/xdvipdfmx/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>tex</herd>
+  <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..10feaa18dfba
--- /dev/null
+++ b/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2828ece15ddf
--- /dev/null
+++ b/app-text/xdvipdfmx/xdvipdfmx-0.7.9_p20130530.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3d97305934b7
--- /dev/null
+++ b/app-text/xfbib/Manifest
@@ -0,0 +1 @@
+DIST xfbib-0.0.2.tar.bz2 340703 SHA256 eeb668b5cedbc9a9b4d8e54767fb7262f173dd9e440031b94580ca108b95f920 SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc WHIRLPOOL b45d18574479c42b3fe473d38b217fa603ff0d69a8f678ea328e7af72d8bb92121dfc450e33f46b747e3a8c25e02aa689d16ba61c988bdb28815ffac52bc0807
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..008cf479f615
--- /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>
+    <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..3641d5beb6d0
--- /dev/null
+++ b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a lightweight BibTeX editor"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfbib"
+SRC_URI="http://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..2cf70e8b74b4
--- /dev/null
+++ b/app-text/xhtml1/Manifest
@@ -0,0 +1 @@
+DIST xhtml1.tgz 232192 SHA256 148e9eccb5c91222b5f0c07359174ca0df1bd74834a2bae4c6e57c10136a2067 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412 WHIRLPOOL a7097078ffab88a042b133edba0a4c1a3cf568c04ae14ce33da4dcf00f8ed16d997a9a08c4b601597a0954f4ecb499bd403f9529326e2ad88aa3f00fe02407ff
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..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..46625a78a51c
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..f1545877158f
--- /dev/null
+++ b/app-text/xindy/Manifest
@@ -0,0 +1 @@
+DIST xindy-2.4.tar.gz 498024 SHA256 616f977b014d67814d6ca45149e1452f3b1410176969d32b6ead5bdf6dc55d71 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4 WHIRLPOOL 2f361bd5d395f3b5cfb63d7dcdaea6d152e979b173244ed32438108639cee31ef71f53fdfc556549ad38dfc85ccc221360d0bce8f3d8b1f86407bd33cd31a9ca
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/metadata.xml b/app-text/xindy/metadata.xml
new file mode 100644
index 000000000000..b206ed83dc2d
--- /dev/null
+++ b/app-text/xindy/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<herd>common-lisp</herd>
+<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.ebuild b/app-text/xindy/xindy-2.4.ebuild
new file mode 100644
index 000000000000..11ebfb72ef9b
--- /dev/null
+++ b/app-text/xindy/xindy-2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-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..177535e086ab
--- /dev/null
+++ b/app-text/xiphos/Manifest
@@ -0,0 +1,2 @@
+DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
+DIST xiphos-3.2.2.tar.gz 7088153 SHA256 2326efd2bad1b27d6c4231cba68077f71f91ee31f73bdada1cbe2c3bd11eadc6 SHA512 14dd33f99217de4062e6ff6c4030fce748f57bc7e4a984aa7927acb7779f3720da21a51eb2943d5be93eac702dcc32b023f9e39a91acb7182ce59b3c90941dbf WHIRLPOOL 488f3fb65b591a9122cc8fc8a1c118cb461ce1890205d53d5957633bb8ff240166616e4de3169afccf5799fb2db40e1e90ac8cef61f3f133e135dd9578227de8
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
new file mode 100644
index 000000000000..02263c72542d
--- /dev/null
+++ b/app-text/xiphos/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>theology</herd>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="webkit">Use <pkg>net-libs/webkit-gtk</pkg> instead of <pkg>gnome-extra/gtkhtml</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">gnomesword</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xiphos/xiphos-3.1.5.ebuild b/app-text/xiphos/xiphos-3.1.5.ebuild
new file mode 100644
index 000000000000..1d3f301f11ec
--- /dev/null
+++ b/app-text/xiphos/xiphos-3.1.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: waf-utils.eclass ?
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="dbus debug webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.6.1
+	>=dev-libs/glib-2
+	dev-libs/libxml2
+	gnome-base/gconf
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+	webkit? ( net-libs/webkit-gtk:3 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils
+	app-text/rarian
+	dev-libs/libxslt
+	dev-util/intltool
+	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
+
+	local backend=gtkhtml
+	use webkit && backend=webkit
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--backend=${backend} \
+			--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 NEWS 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-3.2.2.ebuild b/app-text/xiphos/xiphos-3.2.2.ebuild
new file mode 100644
index 000000000000..c5d5720b5819
--- /dev/null
+++ b/app-text/xiphos/xiphos-3.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: waf-utils.eclass ?
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.3
+	>=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
+	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/xlhtml/Manifest b/app-text/xlhtml/Manifest
new file mode 100644
index 000000000000..632aa8050ef6
--- /dev/null
+++ b/app-text/xlhtml/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-text/xlhtml/metadata.xml b/app-text/xlhtml/metadata.xml
new file mode 100644
index 000000000000..1470e032181b
--- /dev/null
+++ b/app-text/xlhtml/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+</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..0600f6bf95ab
--- /dev/null
+++ b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9dca6394cbac
--- /dev/null
+++ b/app-text/xlsx2csv/Manifest
@@ -0,0 +1,3 @@
+DIST xlsx2csv-0.6.tar.gz 159419 SHA256 06950599efb417f8f4611af6587167688764fb864824973643230bc2849eaa0b SHA512 abcce8c56e354a234fb26980c4e77ae83a3da1863da9b8d4cb819c416ab747066ebbf8f285978ec498c038438d42d50c7bf5a5c79f2c1c85837c6a4f70c54da1 WHIRLPOOL 3819d14f015ccb80d5f4a40c10fdca40903d11a56e24f36151c28d8592248137a82e4cb05e70bd74554f88e5b9bf87ff2353854b04d09aa4371be1f8b1ec64a7
+DIST xlsx2csv-0.7.2.tar.gz 188520 SHA256 7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866 SHA512 c55535271801a690ed9ff28c2572d13cdac0efd206685a2119b73d1da7b4a46754da60782b36f7976bc5dc1b478860430848ccbee347824aea1a6556764c5922 WHIRLPOOL 4be43d36d2d123f6e263251f71d39451f84f881c7290999357b5a0c39bb71617460516e76adff939c36476fbf2675fbb8069a48d61877fd926706053e68e5195
+DIST xlsx2csv-0.7.tar.gz 169287 SHA256 147bbf64d501cc2c9d9428da9b0eee7b11e0981a52f49f188a2ad0a3d434f6be SHA512 e591f389dc8775bd390dd6a000aebdd3159e7f9d5c7b81a5da8f996c1e49c869a799f087815ca7209021f04553b9fade79da537cb1d0b034406c7bd2f9929e51 WHIRLPOOL 40e20d2bfbc92cb976b25f054f8e247174d670050e00dfdaf865af76017ce8fd413f15e60ce07326d6f6f822b5b36956eea8098c2f0ac1c3256358b3a68a0651
diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml
new file mode 100644
index 000000000000..c35d21bf939b
--- /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>
+    <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.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.6.ebuild
new file mode 100644
index 000000000000..a762503520f3
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3} )
+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.2.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
new file mode 100644
index 000000000000..7b13338d1135
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+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.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.ebuild
new file mode 100644
index 000000000000..1473ece6f5e3
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Convert MS Office xlsx files to CSV"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
+SRC_URI="https://github.com/dilshod/${PN}/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/perl"
+
+S=${WORKDIR}/${PN}-release-${PV}
+
+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..7cebcb4bc5d2
--- /dev/null
+++ b/app-text/xml2/Manifest
@@ -0,0 +1 @@
+DIST xml2-0.5.tar.gz 86318 SHA256 e3203a5d3e5d4c634374e229acdbbe03fea41e8ccdef6a594a3ea50a50d29705 SHA512 76b6523e1b64af32529fd8cec52f61f3ca45e452c1398772367f8389368bb7712698e4ba6cb6c8e50e92f68f7f9517f90668c73016e11797931ddb6858782aba WHIRLPOOL 3f2cad5046f94e327b396c8c334691b53335b791c0d912ef4e9bc515543507b0085e660bac2ad716bfd4923b3aab5c9e01f42a4bca92b28c037ee0f490b561d3
diff --git a/app-text/xml2/files/xml2-0.4-libxml2.patch b/app-text/xml2/files/xml2-0.4-libxml2.patch
new file mode 100644
index 000000000000..065049188c5f
--- /dev/null
+++ b/app-text/xml2/files/xml2-0.4-libxml2.patch
@@ -0,0 +1,53 @@
+diff -ur xml2-0.4.orig/2xml.c xml2-0.4/2xml.c
+--- xml2-0.4.orig/2xml.c	2003-12-24 22:28:48.000000000 +0200
++++ xml2-0.4/2xml.c	2008-05-14 20:02:40.000000000 +0300
+@@ -24,7 +24,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ 
+-#include <HTMLparser.h>
++#include <libxml/HTMLparser.h>
+ 
+ int do_html;
+ int in_tag = 0;
+diff -ur xml2-0.4.orig/configure.ac xml2-0.4/configure.ac
+--- xml2-0.4.orig/configure.ac	2008-02-07 18:11:54.000000000 +0200
++++ xml2-0.4/configure.ac	2008-05-14 20:05:12.000000000 +0300
+@@ -11,7 +11,7 @@
+ AC_PROG_CC
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(XML, libxml)
++PKG_CHECK_MODULES(XML, libxml-2.0)
+ AC_SUBST(XML_LIBS)
+ AC_SUBST(XML_CFLAGS)
+ 
+diff -ur xml2-0.4.orig/Makefile.am xml2-0.4/Makefile.am
+--- xml2-0.4.orig/Makefile.am	2008-02-07 17:58:13.000000000 +0200
++++ xml2-0.4/Makefile.am	2008-05-14 20:06:10.000000000 +0300
+@@ -1,9 +1,9 @@
+ AM_CPPFLAGS = $(XML_CFLAGS)
+ bin_PROGRAMS = xml2 2xml csv2 2csv
+ xml2_SOURCES = xml2.c
+-xml2_LDADD = -lxml
++xml2_LDADD = -lxml2
+ 2xml_SOURCES = 2xml.c
+-2xml_LDADD = -lxml
++2xml_LDADD = -lxml2
+ csv2_SOURCES = csv2.c
+ 2csv_SOURCES = 2csv.c
+ 
+diff -ur xml2-0.4.orig/xml2.c xml2-0.4/xml2.c
+--- xml2-0.4.orig/xml2.c	2001-10-28 06:29:46.000000000 +0200
++++ xml2-0.4/xml2.c	2008-05-14 20:03:31.000000000 +0300
+@@ -24,8 +24,8 @@
+ #include <string.h>
+ #include <ctype.h>
+ 
+-#include <parser.h>
+-#include <HTMLparser.h>
++#include <libxml/parser.h>
++#include <libxml/HTMLparser.h>
+ 
+ struct node
+ {
diff --git a/app-text/xml2/metadata.xml b/app-text/xml2/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..58b99b6a651b
--- /dev/null
+++ b/app-text/xml2/xml2-0.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..87d0495f3976
--- /dev/null
+++ b/app-text/xml2doc/Manifest
@@ -0,0 +1 @@
+DIST xml2doc-20030510.tgz 53307 SHA256 dd675754a856f5ca40dfd12e0264ea51228c3d795f853d2310677fd25ea7866e SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd WHIRLPOOL 86498838395687896a381dd63897c24cd968f53f16865ef26cde5dcecd63b3a8249bb45ffe65dabd4e18b41a704b22df0d13bcf3862b01ac50dc631a26c7794c
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..c24d382f30fa
--- /dev/null
+++ b/app-text/xml2doc/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..6bc0ab191413
--- /dev/null
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ab1ecc73e82b
--- /dev/null
+++ b/app-text/xmldiff/Manifest
@@ -0,0 +1 @@
+DIST xmldiff-0.6.10.tar.gz 45827 SHA256 83aba252df2f760c8bf008b9c5d3080911eab2d2b39c371d3b47f67abf4b4ec5 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b WHIRLPOOL f96431ae21277ef3d1ebf3246b65a6b488159c593b6ca8329aed28b9d67c64cab69a7697aecd2150f7e7410a2fef7c6127059b992adae45ae35f07ff964fef8c
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
new file mode 100644
index 000000000000..d99df64178dd
--- /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>
+    <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..2fa4e475152b
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-0.6.10-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/xmldiff/xmldiff-0.6.10.ebuild b/app-text/xmldiff/xmldiff-0.6.10.ebuild
new file mode 100644
index 000000000000..ffbaaaa741a2
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-0.6.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils python
+
+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"
+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..93e637344c19
--- /dev/null
+++ b/app-text/xmlformat/Manifest
@@ -0,0 +1 @@
+DIST xmlformat-1.04.tar.gz 156498 SHA256 71a70397e44760d67645007ad85fea99736f4b6f8679067a3b5f010589fd8fef SHA512 e45471accf0c04e016d3a9a5bbc2f984a9a76e1d5406a80300bf9da9d04bd78b67716055271923669462b70a1713b94a1e1937318115dfd9eb9d258b69a3c14d WHIRLPOOL 0d509c8248ccfd17306f6a75017e2e8199b95d4b2c2dcd2fd622615e041aaac7ae914bc8e911d2a29c6b2aefe3d922698d490dfc89201b7cc76f73380ebcf5fd
diff --git a/app-text/xmlformat/metadata.xml b/app-text/xmlformat/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /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><email>maintainer-needed@gentoo.org</email></maintainer>
+</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..d520298690b6
--- /dev/null
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:2.0 ) )
+	!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..a2789a1cb41f
--- /dev/null
+++ b/app-text/xmlstarlet/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.0.6-setmode.patch b/app-text/xmlstarlet/files/xmlstarlet-1.0.6-setmode.patch
new file mode 100644
index 000000000000..034b732dbd29
--- /dev/null
+++ b/app-text/xmlstarlet/files/xmlstarlet-1.0.6-setmode.patch
@@ -0,0 +1,50 @@
+http://sourceforge.net/tracker/?func=detail&aid=3211822&group_id=66612&atid=515106
+http://xmlstar.git.sourceforge.net/git/gitweb.cgi?p=xmlstar/xmlstar;a=patch;h=5f2445dac0e2a255d89240ec919ecd753045cce5;hp=d0f9902aedc75cef168aa1a34593bc5b74e9669c
+
+
+From 5f2445dac0e2a255d89240ec919ecd753045cce5 Mon Sep 17 00:00:00 2001
+From: Noam Postavsky <npostavs@users.sourceforge.net>
+Date: Mon, 14 Mar 2011 18:13:37 -0400
+Subject: [PATCH 1/1] check that O_BINARY is declared before #include'ing io.h
+
+---
+ configure.ac   |    3 ++-
+ src/xml_C14N.c |    6 +++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b9eb53d..5b2d3bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,7 +109,8 @@ AS_IF([test "x$STATIC_LIBS" != xno],
+ 
+ AC_CHECK_FUNCS_ONCE([lstat stat])
+ 
+-AC_CHECK_DECL([O_BINARY], [], [], [[
++AC_CHECK_DECL([O_BINARY], [AC_DEFINE([HAVE_DECL_O_BINARY],1,[have O_BINARY])],
++[AC_DEFINE([HAVE_DECL_O_BINARY],0,[don't have O_BINARY])], [[
+ #include <io.h>
+ #include <fcntl.h>
+ ]])
+diff --git a/src/xml_C14N.c b/src/xml_C14N.c
+index 3ef1a7c..115e2ce 100644
+--- a/src/xml_C14N.c
++++ b/src/xml_C14N.c
+@@ -20,11 +20,11 @@
+ #include <stdlib.h>
+ #endif
+ 
+-#if !HAVE_SETMODE
+-# define setmode(fd, mode)
+-#else
++#if HAVE_SETMODE && HAVE_DECL_O_BINARY
+ # include <io.h>
+ # include <fcntl.h>
++#else
++# define setmode(fd, mode)
+ #endif
+ 
+ #include <libxml/xmlmemory.h>
+-- 
+1.7.0.1
+
diff --git a/app-text/xmlstarlet/metadata.xml b/app-text/xmlstarlet/metadata.xml
new file mode 100644
index 000000000000..1c8bb75cf93a
--- /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>
+		<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..06e6731711cf
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..06e6731711cf
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..fc508262feac
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c1167f5075a6
--- /dev/null
+++ b/app-text/xmlto/Manifest
@@ -0,0 +1 @@
+DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
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..4538a68724a6
--- /dev/null
+++ b/app-text/xmlto/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><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/app-text/xmlto/xmlto-0.0.26.ebuild b/app-text/xmlto/xmlto-0.0.26.ebuild
new file mode 100644
index 000000000000..0d423a6dbf1c
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.26.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook formatted 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"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
+	app-text/docbook-xml-dtd:4.2
+	app-shells/bash
+	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 )
+	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/xournal/Manifest b/app-text/xournal/Manifest
new file mode 100644
index 000000000000..a98e5806b2d8
--- /dev/null
+++ b/app-text/xournal/Manifest
@@ -0,0 +1 @@
+DIST xournal-0.4.8.tar.gz 641240 SHA256 233887a38136452dcb4652c35d08366fc7355f57ed46753db83e3e0f3193ef30 SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf WHIRLPOOL 23c0c31e2e902e42602f62f5060078e878b42e558c90208bd3326054cb733115449b9f36571175d24af3f98164f674049455045968c7f2890370428d447949c2
diff --git a/app-text/xournal/files/xournal-0.4.7-am113-2.patch b/app-text/xournal/files/xournal-0.4.7-am113-2.patch
new file mode 100644
index 000000000000..55640b9cc555
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.7-am113-2.patch
@@ -0,0 +1,24 @@
+From 8f80915eade771f97eae8241adad9118c9144363 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Thu, 2 May 2013 18:17:14 +0200
+Subject: [PATCH] remove call to AM_PROG_CC_STDC obsolete in automake-1.13
+
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a74f7ef..664d933 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,7 +7,6 @@ AM_MAINTAINER_MODE
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_RANLIB
+ AM_PROG_AR
+ AC_HEADER_STDC
+-- 
+1.8.2.1
+
diff --git a/app-text/xournal/files/xournal-0.4.7-am113.patch b/app-text/xournal/files/xournal-0.4.7-am113.patch
new file mode 100644
index 000000000000..242d00f476ba
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.7-am113.patch
@@ -0,0 +1,25 @@
+From ae2821f664b0615779638cdd1eca414e500e7f92 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Tue, 30 Apr 2013 22:29:32 +0200
+Subject: [PATCH] replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 52a07df..ba827c7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(xournal, 0.4.7)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+ AC_ISC_POSIX
+-- 
+1.8.2.1
+
diff --git a/app-text/xournal/files/xournal-0.4.7-ar.patch b/app-text/xournal/files/xournal-0.4.7-ar.patch
new file mode 100644
index 000000000000..9f7531f40126
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.7-ar.patch
@@ -0,0 +1,24 @@
+From 0a1f22f433addb3317b225c8e26c4268ce6df856 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Wed, 1 May 2013 23:55:18 +0200
+Subject: [PATCH] Let automake define AR, since it is used for libttsubset.a
+
+---
+ configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.in b/configure.in
+index ba827c7..a74f7ef 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_HEADER_STDC
+ 
+ LDFLAGS="$LDFLAGS -lz -lm"
+-- 
+1.8.2.1
+
diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml
new file mode 100644
index 000000000000..240162ef2f90
--- /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>
+		<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.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
new file mode 100644
index 000000000000..6eb249ec7149
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+inherit gnome2 autotools
+
+DESCRIPTION="Xournal is 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
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal"
+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..920b89bae6b3
--- /dev/null
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+inherit gnome2 autotools
+
+DESCRIPTION="Xournal is 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
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal"
+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..dccb57e30723
--- /dev/null
+++ b/app-text/yagf/Manifest
@@ -0,0 +1,2 @@
+DIST yagf-0.9.2.tar.gz 258305 SHA256 1099760462c029aa9919ef96809a1b0252d8d735d9d0807ce790f9d3e1e271b8 SHA512 7348b1611654e9478ef915a5c56f729495382e083bf99ad85284a19499027ad380f7781466aa6c21796859623ca3526ce0965f690c784aa2d459a22d201ef98f WHIRLPOOL b91ef8688801951fe780bdb6e005abd3b97ac42ab7f8d0e9b13ab83a7a163caa445d95b6668328ed1336137ca4bfb5391078347f06fd97ca1a3721b7a90db384
+DIST yagf-0.9.3.2.tar.gz 766396 SHA256 32dd2a60ac04f9b08ec06a4e2974fde2fe3af60238b6a1a8de5a0a29b6ead231 SHA512 79fd1f9fe3a6d10e568b46653d6afd8ef050b4dead58aea42f42888461a1a095ff85e0cf577cb641ba13fb4e9be1efadd000688e100675a03f2c91952211b6fc WHIRLPOOL 37d5d777de797a54676933ec4a35668a4a248d6e90f181ab2e414af5e97ab1c8d9297b5ecbe3c99b1db64d536a234e51fada3f0e1a2353119de367632c567961
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
new file mode 100644
index 000000000000..784a59b98c05
--- /dev/null
+++ b/app-text/yagf/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>yaleks@gmail.com</email>
+	<name>Aleksandr Yakimov</name>
+	<description>Proxied maintainer. Assign bugs to him</description>
+</maintainer>
+<maintainer>
+	<email>pinkbyte@gentoo.org</email>
+	<name>Sergey Popov</name>
+	<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
+	<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.2.ebuild b/app-text/yagf/yagf-0.9.2.ebuild
new file mode 100644
index 000000000000..272c3dfeb9b3
--- /dev/null
+++ b/app-text/yagf/yagf-0.9.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_IN_SOURCE_BUILD=1
+PLOCALES="de lt pl ru uk"
+inherit cmake-utils l10n
+
+DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
+HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
+SRC_URI="http://symmetrica.net/cuneiform-linux/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scanner cuneiform +tesseract pdf"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+DEPEND=">=dev-qt/qtgui-4.7: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() {
+	l10n_find_plocales_changes "src/translations" "${PN}_" '.ts'
+
+	epatch_user
+}
+
+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/yagf/yagf-0.9.3.2.ebuild b/app-text/yagf/yagf-0.9.3.2.ebuild
new file mode 100644
index 000000000000..78d2edc88731
--- /dev/null
+++ b/app-text/yagf/yagf-0.9.3.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="fr ru"
+inherit cmake-utils l10n multilib
+
+DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
+HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
+SRC_URI="http://symmetrica.net/cuneiform-linux/${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() {
+	# 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..50e7561e5758
--- /dev/null
+++ b/app-text/yelp-tools/Manifest
@@ -0,0 +1,3 @@
+DIST yelp-tools-3.12.1.tar.xz 202816 SHA256 7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172 SHA512 205e3394267cd2e987069400c7507f546cbc75953b080d8dd22915a660288b7f073a996026fb1c383ac108da23a1682a8c30a009cf5038128a52796bb95cd9cd WHIRLPOOL e13b9dc99d8d8abf2bb3ef0babe0d00b756542bc5c0fc5407cd685f7650124731043d186cf0a754bc3a53060de3b541bdb3d18a03ffcbd68fa9cf96958d3e0cf
+DIST yelp-tools-3.14.1.tar.xz 206688 SHA256 000222baf5d2db394df6025591054976b5cecd0b27872601de7538f36520f60f SHA512 4fd55d62165fc999f3576730942631b9af9c25001daa385fcf45b8a138e852a824028bad3f9cedbcc13f8881ae71f3ec8f7d5be6d0ecf22e408d3b08c5b67798 WHIRLPOOL ef26fff6ec81a7f599f83566172bcda1d431531726c11d03b92673acb3a2defe6bfb26a1febc6615a852a1808fc1dd5ef0648a4c5c05ca08ae03bebb919de63d
+DIST yelp-tools-3.16.1.tar.xz 203568 SHA256 b4f66c145af1c6448dc51037d305d6844da13dc31d07729b8e29005ee4fef89c SHA512 5fbb2b5b907bdffc7ccf0a108a80c7fe1e5486be6774b3d799f10e3444e286fcf8055629fe7df22ae8ef5784e52133df1b8dca6ee13fa3c2191080e14546d956 WHIRLPOOL bf4c184780afd82db0a6076da6320b41257e304dec59a27d39a62fce477938dd41153cf41ba65769709b0b8d17d630ab4cf7c11b6ed6932351cd8e4bc5e7ef43
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/app-text/yelp-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-text/yelp-tools/yelp-tools-3.12.1.ebuild b/app-text/yelp-tools/yelp-tools-3.12.1.ebuild
new file mode 100644
index 000000000000..3a7b1efc5226
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+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
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-text/yelp-tools/yelp-tools-3.14.1.ebuild b/app-text/yelp-tools/yelp-tools-3.14.1.ebuild
new file mode 100644
index 000000000000..b1ca0a32e229
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.14.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+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
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
new file mode 100644
index 000000000000..16d4168b3459
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+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
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
new file mode 100644
index 000000000000..5bb518d18f14
--- /dev/null
+++ b/app-text/yodl/Manifest
@@ -0,0 +1,3 @@
+DIST yodl_3.04.00.orig.tar.gz 296554 SHA256 66b317877906e165506796f9342a1adf931376f7d8b6990b2d2ff12107685893 SHA512 d9e67c0dd15987fde2047bd5deb4e3a3d752e3ba5d398d4f5c4b7d02cc165a2500f7715eccefa8456d104ece5e42ca8e2b0b4746ad582fbf2100f6849c4a69a6 WHIRLPOOL c7a6cec7379372c8e6fb211c3178377e1d0639389c51032cc6e63c2968a39c474998f946db6464882ea096ac388dbd0ecbe380531a364a950e6bb4e281c9717e
+DIST yodl_3.05.00.orig.tar.gz 301612 SHA256 2f360062a85f9359207088b2586da863e2b111428f3e12486cd34c9de12b1b8a SHA512 45eccfb59853f57ffe2219b6de26e9851a28c59049b6165cc5dbd7201b5078b5930a286c0b2c61f534483b80f7c8c5de79925784ac6c29843d8c3842b508f7a8 WHIRLPOOL 31905df64082237f0aa91101bdf775164997fb467261ae156b012924c6e8c93eed9679b0fc45142520e1d2360239ec003abd41e811db3827cb530a6ba9cd0a74
+DIST yodl_3.05.01.orig.tar.gz 302038 SHA256 5a3d0e1b2abbba87217cfdc6cd354a00df8d782572495bbddbdfbd4f47fe0d3e SHA512 d2e8216511f50f053809d7b4c50c733ea72b62ef987608381c2583f008347f889e897b7104eaa63a040c4290909d681971a8a0624b15f204dc8ad47a4f2ceb1b WHIRLPOOL fa2dc18eab78af022d945eeb7436483a1d0cf0a947a450cbf045a763348378ebe2d192297c462b3c6fc30756f283d1186b4f3c1d9e9d5bc707aaace9ebc9e09b
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
new file mode 100644
index 000000000000..b7354134ca26
--- /dev/null
+++ b/app-text/yodl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">yodl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/yodl/yodl-3.04.00.ebuild b/app-text/yodl/yodl-3.04.00.ebuild
new file mode 100644
index 000000000000..04d2224b3bbd
--- /dev/null
+++ b/app-text/yodl/yodl-3.04.00.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="http://yodl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-util/icmake"
+
+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 ru/$(tc-getAR) ru/" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+}
+
+src_compile() {
+	./build programs || die
+	./build man || die
+	use doc && { ./build manual || die ; }
+	./build macros || die
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install man "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-text/yodl/yodl-3.05.00.ebuild b/app-text/yodl/yodl-3.05.00.ebuild
new file mode 100644
index 000000000000..74eeb452d218
--- /dev/null
+++ b/app-text/yodl/yodl-3.05.00.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="http://yodl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-util/icmake"
+
+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 ru/$(tc-getAR) ru/" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+}
+
+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.05.01.ebuild b/app-text/yodl/yodl-3.05.01.ebuild
new file mode 100644
index 000000000000..74eeb452d218
--- /dev/null
+++ b/app-text/yodl/yodl-3.05.01.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="http://yodl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-util/icmake"
+
+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 ru/$(tc-getAR) ru/" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+}
+
+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..891fb2276c96
--- /dev/null
+++ b/app-text/zathura-cb/Manifest
@@ -0,0 +1,3 @@
+DIST zathura-cb-0.1.2.tar.gz 6636 SHA256 72b20e2de452ccb8428fe0007bf12cee06c3422eac8e5e3b2c0ecbc9848850e0 SHA512 bc2c8c846e40ee17aa9df989ca019382d1e4b3074376431c1a2f8190607c4d200ed159de161b8cbb1800bd1f494a770691fec803bc8ce661fe317cf753efc4b7 WHIRLPOOL b0f8c3e67842c7e9469b4d3d21f27fb15ad29bfef5540556c8ae6c23e1bbecc368e3cb60b9f4f8882cdb9d26ddf88f9d75613463acacde23d415f8b4c9857061
+DIST zathura-cb-0.1.3.tar.gz 7191 SHA256 7c9b744201ee690b6d3667481bd5ae97de27abeb4d594a80ecaf4ee8a041023f SHA512 13d64e4e508c35e170db33f5a3fa29894ab26a0ede5a9c55ec4e546faee570a13791af1a48f335c506833d706823554a0fbaeb950a60d6332f3bff41668ce294 WHIRLPOOL b11f7278ddfa7102169eb74863a894846d220238fd289efcc240b10cd34687ff75414641c2565e15c3e9bc4357e00a303737f94a5e8436b02a95a872ba5a54a4
+DIST zathura-cb-0.1.4.tar.gz 7205 SHA256 f21cb140cce02b3ef8b23eff479a7f66285667ab47cdc099c10cd62eaf239626 SHA512 e36b6adad6bb9cfb2f5e5536db6a9392318c000408336376881dae537a1978eaefd3aea99a0de1e33599f433ef6bb14dc0273d1f6c12bce16570a1f544296e77 WHIRLPOOL 86aeb768f717ff7bfd01a5ed00fdbfa368a53098017682e5a3fee2f328638a2f4e886e3d9c0f7eefe7ab990f3e9fececc445b11b8edbdf85fe6ba2c69fcedfc7
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
new file mode 100644
index 000000000000..e21ab424480f
--- /dev/null
+++ b/app-text/zathura-cb/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>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <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..174184274cae
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3.ebuild b/app-text/zathura-cb/zathura-cb-0.1.3.ebuild
new file mode 100644
index 000000000000..9b3c588a8e5d
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3.1
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:="
+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.4.ebuild b/app-text/zathura-cb/zathura-cb-0.1.4.ebuild
new file mode 100644
index 000000000000..2347b3176202
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3.1
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:="
+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-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
new file mode 100644
index 000000000000..9b3c588a8e5d
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3.1
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:="
+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-djvu/Manifest b/app-text/zathura-djvu/Manifest
new file mode 100644
index 000000000000..8b4566f38662
--- /dev/null
+++ b/app-text/zathura-djvu/Manifest
@@ -0,0 +1,2 @@
+DIST zathura-djvu-0.2.3.tar.gz 11181 SHA256 c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89 SHA512 6fd9c1d367d02402bc5eaedd853ed0d37aee61a682772c3c2dd543d98c03d85b32cd2b4af4b7f7a6390e97206aa881ebd6df9783e7abf4222352fb4d57de4850 WHIRLPOOL 447aee58bf3c0e9baed6d9d60505245777fd38be8bb2ae4c2f387a98afe334a01cd870995884f99d073904ba6812120c6660d88864bc3d38798d94e1c7d9cd76
+DIST zathura-djvu-0.2.4.tar.gz 11197 SHA256 ac10b8c07fd9f58281225e1a4cb026634cd03bf6b549eaceeea02f99ab5334bc SHA512 192df545b686259089342044ab682c2517f8e377667a9d44f6f416e1ac7fb7b2e45fa22d34004583c6081650a15d2becb350296a39a647a8dcd2ccc7ef1066d8 WHIRLPOOL ca0cf5570ee5529233110b7db1c29e5572ba321b7dbe59a4632ce23861cb15e0b6e85118bd5159c94a7e5d715c10bafc856a4eb4070413eb66601513eaf26542
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
new file mode 100644
index 000000000000..e21ab424480f
--- /dev/null
+++ b/app-text/zathura-djvu/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>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <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..80b52bd81ae4
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.4.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.4.ebuild
new file mode 100644
index 000000000000..a31e9ddb9fb7
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.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..a31e9ddb9fb7
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.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/metadata.xml b/app-text/zathura-meta/metadata.xml
new file mode 100644
index 000000000000..a02395352341
--- /dev/null
+++ b/app-text/zathura-meta/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <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..2a0b19a5e3a2
--- /dev/null
+++ b/app-text/zathura-meta/zathura-meta-0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ff0411f78fdf
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -0,0 +1,3 @@
+DIST zathura-pdf-mupdf-0.2.6.tar.gz 9094 SHA256 5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20 SHA512 5dda347055a0286229e63b7de02bd58314590bfe0edd25d793169f30061083dbf7915669657c7f717c6a3b141b23acd4481dbdb81fa69e399385b2c3eff4272f WHIRLPOOL 6ea732523c0fe4f1324a690a4a7120da5d422f976358270ea096516fb2470b61f1efd3f3be0c1735320e3b9d5de5f0672ee69fd48c6b72135ae686908f1d089e
+DIST zathura-pdf-mupdf-0.2.7.tar.gz 9357 SHA256 b1343f35940ebcf463b868b557be4eaba7d61884d6ff3ad3d7c7c272e69c253f SHA512 0c0b5ab13cce85f7328fa5ba967ceba926793d7e19fc8e41875fe98b5878292d395edab71e5df86bc6fe86ad111031510362303b7f08a8375731e41a73237a82 WHIRLPOOL a46915fa33f563adb18d462c58a516fd76f69ccdc30b05605b566215acaf47776d36f285019e68bd9d9b4e6c91616a6a0f130478d7ef1668db9a670bdd164b92
+DIST zathura-pdf-mupdf-0.2.8.tar.gz 9930 SHA256 9f8b92762cdad14a2a587744c758edc0e1003be6a0c1511486065bdc91a66910 SHA512 fce85f513c7d99e1bc48a288fd9f9a14b8ab01ade660ac8eaeeffb3ceaa695d210026d2c4d9c0bf383df613b98a3cb56499b2c835a7d8873dd896d73c61b7258 WHIRLPOOL a0ba8f961c98c9681ae352097cfd0bd58613929466e1a7f072df8d162fe3d9888a7cf073bf995a4ff88332b96a6e40d91f2c65c23a0bf157e5e15c93f00454f0
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
new file mode 100644
index 000000000000..e21ab424480f
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/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>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <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.2.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild
new file mode 100644
index 000000000000..ea3474144973
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mupdf-git"
+
+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.3:=
+	>=app-text/zathura-0.2.7
+	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-0.2.7.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.7.ebuild
new file mode 100644
index 000000000000..bdedfa8c59e3
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.3:=
+	<app-text/mupdf-1.7:=
+	>=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-0.2.8.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.8.ebuild
new file mode 100644
index 000000000000..ea823baba12b
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.7a:=
+	>=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..f05447225918
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.3:=
+	>=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..81f7d2645882
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -0,0 +1 @@
+DIST zathura-pdf-poppler-0.2.5.tar.gz 9650 SHA256 60b327596d65bcd39edd5bf05b8cca8f9b658f51e626611ea99247a49b860cac SHA512 6ef167873c469a15f46a59a7e5cf1d50a3b9e3cb496f135da17975de7f9631b8e41076d1e7767f5715eb805d77e19e1bed3e4b39a0c49b0ea6ed2aebe616d56d WHIRLPOOL f84d9214d6e1e4872bd8aa1fae9092e2694a0a998a847b9966376da54bd15d97dcda8116c4431b13e1b1afeeb7ba77b155446d884088c47a2986f933d9f0933a
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
new file mode 100644
index 000000000000..e21ab424480f
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/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>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <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..64f905fc1e90
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
new file mode 100644
index 000000000000..a8ca8d9e6b92
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-ps/Manifest b/app-text/zathura-ps/Manifest
new file mode 100644
index 000000000000..43c683774115
--- /dev/null
+++ b/app-text/zathura-ps/Manifest
@@ -0,0 +1 @@
+DIST zathura-ps-0.2.2.tar.gz 5793 SHA256 e6546261db03b0b6b6499a8e109dc9ff3b8eb8b154ce45f5c6284c1e76d1d7a8 SHA512 4cedd614127b995ad834d5913dd5d9b3dff6172ac31cf42e8d43941815ac03a4872f41d7766c325f435feffa63364c9c377f760cd0540d2f36753e7df1c4c49e WHIRLPOOL 246f7cede9096474efab0c1b4f25bbd4b908eeb1a3a995d390939c02b79ca2adcce86582fd4129189b20e9028f6c0e9079c674cc1beebc59844b8b3d5597b76c
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
new file mode 100644
index 000000000000..e21ab424480f
--- /dev/null
+++ b/app-text/zathura-ps/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>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <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..c34c4ce31c58
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}"
+	)
+}
+
+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..a1fa8e62d57d
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}"
+	)
+}
+
+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..51a9efb1b5a1
--- /dev/null
+++ b/app-text/zathura/Manifest
@@ -0,0 +1,4 @@
+DIST zathura-0.2.9.tar.gz 196690 SHA256 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503 WHIRLPOOL 4c436fc9a78ea797d1e094baa04755c5cd8e3470371ad15296eab0b346c8a4ea5018c10240d5f9f1647995f2e645665aad3c867a67d1281fb3b843375af448ee
+DIST zathura-0.3.1.tar.gz 201239 SHA256 b502c0220d7220310ca6277042fcb11a0bbaafbaaa926306b27bde6ff79192f3 SHA512 400643f87bfe918345bbff78076161a9b99981dd658e1791194b2826d8b0e4106eeea775ebcb18e8fa7cdd1e2ee07b8e95a7a4544dd34934b42cf99a694b4d71 WHIRLPOOL 7bb0c8008a15e9078b6731cf12ce342eb69c15a7de283f3e34dddf660199f38ac0cd66674ba8ea9695f7ed3622298a9b608decd93ada4bd0d77cec7782e32c98
+DIST zathura-0.3.2.tar.gz 202943 SHA256 fda6503dc5b21f7c667301798fbd2c978897e68b4555e8c731945cecd9d165e2 SHA512 17d221079a748681c7bbdeb8bcb7dac876db1300ec970b553dffd166e67d945708911a13dca000b425198b87c0a232f41f71c12f174037d261933e17882e3224 WHIRLPOOL 56106e15a30eb8f9acfbd37001a6217f243c33822b3dd9fffb978f7d06eaa78d457165908f1a1f4aa260d1ffabddfdf46f6c217c97131fe93549094fff4cdd7f
+DIST zathura-0.3.3.tar.gz 203604 SHA256 3347decfc8d4b918a6bca1d44657c3b97d4afcea3c8c1f162c57198b13e8dce7 SHA512 0bfcb2c9ca6e7cf44db1c04fdcc5e1e2122b5bd060c10b711a331f885371a523881a46376c770b60cf199530fd9c7814248e8a6da556da8cd464a3a85dbad8e3 WHIRLPOOL c7d94f9db579336f6c2f41b1789e5ffba882b0c00c57e935146297c445cb1ec2894dc7d3dfc0b02ce695e5b5849d3820f91dea8149f206e036c3aae3402b8a4c
diff --git a/app-text/zathura/files/zathura-0.3.2-no-sqlite.patch b/app-text/zathura/files/zathura-0.3.2-no-sqlite.patch
new file mode 100644
index 000000000000..3a93db8d78fb
--- /dev/null
+++ b/app-text/zathura/files/zathura-0.3.2-no-sqlite.patch
@@ -0,0 +1,11 @@
+--- zathura-0.3.2/Makefile
++++ zathura-0.3.2/Makefile
+@@ -12,7 +12,7 @@
+ SOURCE    = $(OSOURCE)
+ CPPFLAGS += -DWITH_SQLITE
+ else
+-SOURCE    = $(filter-out database-sqlite.c,$(OSOURCE))
++SOURCE    = $(filter-out ${PROJECT}/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..7cdc773bbdd9
--- /dev/null
+++ b/app-text/zathura/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <use>
+	<flag name='magic'>Use libmagic to determine mimetypes</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..737b2b5c90f1
--- /dev/null
+++ b/app-text/zathura/zathura-0.2.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.1.ebuild b/app-text/zathura/zathura-0.3.1.ebuild
new file mode 100644
index 000000000000..d11b9839f820
--- /dev/null
+++ b/app-text/zathura/zathura-0.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3: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() {
+	# TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1
+	myzathuraconf=(
+		WITH_SYSTEM_SYNCTEX=0
+		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.2.ebuild b/app-text/zathura/zathura-0.3.2.ebuild
new file mode 100644
index 000000000000..8e2776f2ad11
--- /dev/null
+++ b/app-text/zathura/zathura-0.3.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3: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() {
+	# TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1
+	myzathuraconf=(
+		WITH_SYSTEM_SYNCTEX=0
+		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_prepare() {
+	epatch "${FILESDIR}"/${P}-no-sqlite.patch
+}
+
+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.3.ebuild b/app-text/zathura/zathura-0.3.3.ebuild
new file mode 100644
index 000000000000..ecd9635f9420
--- /dev/null
+++ b/app-text/zathura/zathura-0.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.4: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() {
+	# TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1
+	myzathuraconf=(
+		WITH_SYSTEM_SYNCTEX=0
+		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-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
new file mode 100644
index 000000000000..d11b9839f820
--- /dev/null
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3: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() {
+	# TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1
+	myzathuraconf=(
+		WITH_SYSTEM_SYNCTEX=0
+		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/zemberek-server/Manifest b/app-text/zemberek-server/Manifest
new file mode 100644
index 000000000000..d9f775763bc4
--- /dev/null
+++ b/app-text/zemberek-server/Manifest
@@ -0,0 +1 @@
+DIST zemberek-server-nolibs-0.7.1.tar.gz 17877 SHA256 39acbb089241e3a9e7fe09c23f6b313afb075114069c9db414fff15b455e0276 SHA512 5a4c880976c69e4a4f24f778326008ac0a6ea14ed621f8953643298ab2b723799ec4974b55fac5d6b68e5c9134d0e4e06829535cbb2119aefe765cffe0fc9f1d WHIRLPOOL a42fc54fb4e47ab4db978afbaa21f5e7566753e550cb73ef478ebd9b7d357783e80d7206b12a952b854c13778b26ed8c937494442fe7926481b35e5af3e60bc8
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..7925f9e106bf
--- /dev/null
+++ b/app-text/zemberek-server/files/zemberek-server
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+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..d75afba941ef
--- /dev/null
+++ b/app-text/zemberek-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">zemberek</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..392f434314e9
--- /dev/null
+++ b/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
+HOMEPAGE="http://code.google.com/p/zemberek/"
+SRC_URI="http://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+S="${WORKDIR}"
+IUSE=""
+
+CDEPEND="dev-java/zemberek[linguas_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..c7820ea2dd5a
--- /dev/null
+++ b/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
+HOMEPAGE="http://code.google.com/p/zemberek/"
+SRC_URI="http://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+S="${WORKDIR}"
+IUSE=""
+
+CDEPEND="dev-java/zemberek[linguas_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..ec2d404bd3d7
--- /dev/null
+++ b/app-text/zpspell/Manifest
@@ -0,0 +1 @@
+DIST zpspell-0.4.3.tar.bz2 10510 SHA256 465e07b899e1cea24eb1294addfc66e57c47e10c00c2d6d283d8c17f4d243f48 SHA512 b87409735e7c6f8306992e98d006130c9a39cb0903a5938023d6f1379c37e9b12b381f917f71f09e08a557a7cc7cfc1d93536b4fea49d007f20b0da8f7fd3c98 WHIRLPOOL e1ad311bc88411cd42fc118c0ab872f437fe3e4f14248c5fedfd8d96bebb3c81ae9cd5d652ee7d7b2643b546e6a4b1bc6ff1629ac701f2267350defe88d39786
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..91f4e72fb544
--- /dev/null
+++ b/app-text/zpspell/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</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..1471b0eee931
--- /dev/null
+++ b/app-text/zpspell/zpspell-0.4.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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."
+}