gentoo resync : 04.08.2018

55 files changed, 587 insertions, 914 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 61f8300c739e..752ea41c5af7 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index a0b373948ee1..ba202e82bbcf 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.13.9.tar.xz 319084 BLAKE2B 2e23e85d657e2905a94f71cebae31868a241783d44dc4da76c3bda02cf7c96c0516a834399e0b5bb66716c959acc32dac9d1374388a4e597a03dff9e8e11fef3 SHA512 9160884fd0a4088abacb9f4f3168c80a5a8b01d81a13606f3abf8c0f54b2bf0459f1c3833ab953a072eb87b8b8d8fc31467036999e85e2448fecbc36f97bb1db
-EBUILD blogc-0.13.9.ebuild 1120 BLAKE2B 4d5a2dba5c10f3bd5015842da3f9a24b41ffa71343f783371a9c50aa0c32bc5e96b0becb56364c09d163d0e64246688d45676fb333de9ab8718c5fe8869bb001 SHA512 80e734b9155ac024c78b58e68216d7f591507ca5aa2cd264e69f0b2a71837943c3ec6b7acd00e5d5b4b08a6c64bc370bf926730a8b8ed7ffe8d1ce3ab0865e36
+DIST blogc-0.14.0.tar.xz 321752 BLAKE2B b25358c415684a305971945d87d9c21d9da3009ac35756ce501748e1de3824a82d0d855f15c0a5b5423bac775da5361470b32fb51e86b2cb33b28017cad976ff SHA512 e9239a754b80b93ac98241f7ed6c0a962bb6bc2fb02dcc7eafbf5075f81655dc93c7bf0c41eb0c06fb158d60c8a42bf6ede6c7a58761707f2811a0a96d516a25
+EBUILD blogc-0.14.0.ebuild 1120 BLAKE2B 4d5a2dba5c10f3bd5015842da3f9a24b41ffa71343f783371a9c50aa0c32bc5e96b0becb56364c09d163d0e64246688d45676fb333de9ab8718c5fe8869bb001 SHA512 80e734b9155ac024c78b58e68216d7f591507ca5aa2cd264e69f0b2a71837943c3ec6b7acd00e5d5b4b08a6c64bc370bf926730a8b8ed7ffe8d1ce3ab0865e36
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.13.9.ebuild b/app-text/blogc/blogc-0.14.0.ebuild
index 29595c41810e..29595c41810e 100644
--- a/app-text/blogc/blogc-0.13.9.ebuild
+++ b/app-text/blogc/blogc-0.14.0.ebuild
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 9731b7ea538e..3d9cd62e8638 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,4 +1,5 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
-MISC metadata.xml 244 BLAKE2B bb7b24c64c26a7f15cd94824d3dcced7f4680be7b408e344b8255ab4d2811a85e0b6941172dc28e10077d58c07d16788e8e42725526e51968fcb07f340af90f0 SHA512 bbbde89bd3a4d4e2071d840c10a83781a0950bf6e362bc4e69a24ac9da5ce216ec338a935519e8913df63db8b3ecd12f6ac3868519fd1b1378285c923fd234ec
+EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1565 BLAKE2B 321a8fb7c20cf54eaee41da434d1d053c5b82d7285b469573c7e4d7d1986ffb865664f19eccea3b1b3dd9b1ec3fef8c084dd77039720cc3864fa0bebd3ccf735 SHA512 d4f5996b503f9307ccff06b8e3af81b24d37ea5280596146fd9faa48bef2f07638070f59f4e5a7e0e2bde4d9e470d865e91e772cc4e396d18b43a9752310ae04
+MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
new file mode 100644
index 000000000000..2cf6e40311d1
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# EAPI=6 is blocked by Gentoo bug 497052.
+EAPI=5
+
+MY_P=${P/-stylesheets/}
+
+inherit sgml-catalog
+
+DESCRIPTION="DSSSL Stylesheets for DocBook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	app-text/sgml-common
+	app-text/docbook-sgml-dtd:3.0
+"
+
+DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local dsssldir CATALOG_DIR=usr/share/sgml/docbook/dsssl-stylesheets-${PV}
+
+	dobin bin/collateindex.pl
+
+	insinto ${CATALOG_DIR}
+	doins catalog VERSION
+
+	insinto ${CATALOG_DIR}/common
+	doins common/*.{dsl,ent}
+
+	insinto ${CATALOG_DIR}/images
+	doins images/*.gif
+
+	for dsssldir in html lib olink print; do
+		insinto ${CATALOG_DIR}/${dsssldir}
+		doins ${dsssldir}/*.dsl
+	done
+
+	for dsssldir in dbdsssl html imagelib olink; do
+		insinto ${CATALOG_DIR}/dtds/${dsssldir}
+		doins dtds/${dsssldir}/*.dtd
+	done
+
+	insinto ${CATALOG_DIR}/dtds/html
+	doins dtds/html/*.{dcl,gml}
+
+	dodoc "${DOCS[@]}"
+}
+
+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"
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index 4c2c3e9fe569..df1f6e962108 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="github">docbook/dsssl</remote-id>
 		<remote-id type="sourceforge">docbook</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/gentoo-guide-xml-dtd/Manifest b/app-text/gentoo-guide-xml-dtd/Manifest
deleted file mode 100644
index 0166072379bf..000000000000
--- a/app-text/gentoo-guide-xml-dtd/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX catalog 524 BLAKE2B 1d90d6e15d695f4d0f211126e04d9cdfacb833fceb229c54d38c44552e183cec0142959a7e4c382fe202563ceed1f20a4aa6feff243c55c1eaf957345616df63 SHA512 1a5ea6247d65553e823b853311a13eeed9c589e4c66203e152b516f636b8a39f53560715dbf6f421d653af2e78f63327f913894556645ae92a3d479d3f3b2c85
-AUX ent/iso-lat1.ent 4554 BLAKE2B 8104bd317a28f0f546711effbfbef779cc5a736ff541b91e55c0fcaf07cf477f1b164a1d45548d274bcf6cf4fc46eee15b614785344561c116946b239eaff00a SHA512 3e86258b3ac6849b82e6524d7701ed2ce1cafbb1697c3ce900572f55515a8fecfb1ea9e245939eaa58d6d99625719e258aab9f7660ca2d132cb9eb9deee055c4
-AUX ent/iso-num.ent 4085 BLAKE2B 62d1e659ae9a3720db491285b832b2b1f756fbc94fbccb6ab2e2205308a4a918343e3dd090f19b4952a9e834d70059fc727256490ae84f488675023b2976e2ff SHA512 2ba450e7b2f144425b373f04b17cf6724ceecfafca9e6bbdcbd67a0f945a078ad882d969f7509e0170bb2b532299d9b4b73c3bab735279029355344d8e411044
-AUX ent/iso-pub.ent 4590 BLAKE2B e038697bca47cb62bf6614f84eda55fa6726e7c08bbda757eb646977df6d91289daeafac1937de39a4dfbfc9fee273e81de9f7add6ac052c9a653867a12d211d SHA512 b18f51ee40d602d0e91e1b6472f81f7fe1222394d818443616deb174806db217093794291bf410372ceb558ba05d875834b0ebc263135d632cf9ed73ddf16fce
-AUX guide/guide-2.1.dtd 3806 BLAKE2B 08f1dddad2f7e576a639deb30801d5cb80e52982a1979fe753b57cea7878f6a098f6f58114bda71c04fbac0fcc13af6eba91d3aea9c3c0682bb4a479c85058d0 SHA512 b44e40196353446a3ad02e0288ce387b72cb35177ed9fbc3f4a1e046ccc54658ea94d48aa344508dc10b60d2096e4309e80db21381638d515a225976a9e65626
-AUX guide/guide.dtd 7026 BLAKE2B cb9c56253e6f80da38eb64908fe0a85555952e885eb155a6cf0f6126abb2c27f0a4c648b8a637bc51ba565fd01c2c9dd137114a09352c1c10ab83b5f25b090ba SHA512 088436a7e1d1c9d23f717b34fdef5ef80f04f64ce68edf1d98c430266e77c06b0857db1e028aa640ae5457ac7f0ba95cbc45f79e3bd7945a388f8403dd12e508
-EBUILD gentoo-guide-xml-dtd-2.1-r1.ebuild 702 BLAKE2B a0b782b7a4b0b653727cbf0b9edcc77f90c2f738f4acad61054fdcb5717f14a959c3baea05c69ce9616da9b5ea45f72271a43be9686220bbdca4d8f755bd9f80 SHA512 936b736a4b7193999901c1511891b5b96a85a118fdb851b5067e9847b5912e2dee099ffc20fc14bea968434668c41bdfb1fc20efe448c73d6faae4be90001470
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/gentoo-guide-xml-dtd/files/catalog b/app-text/gentoo-guide-xml-dtd/files/catalog
deleted file mode 100644
index 48f011faf9c3..000000000000
--- a/app-text/gentoo-guide-xml-dtd/files/catalog
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  -- 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
deleted file mode 100644
index 2ec16fffff36..000000000000
--- a/app-text/gentoo-guide-xml-dtd/files/ent/iso-lat1.ent
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- 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
deleted file mode 100644
index 7f4844c5e0ee..000000000000
--- a/app-text/gentoo-guide-xml-dtd/files/ent/iso-num.ent
+++ /dev/null
@@ -1,81 +0,0 @@
-<!-- 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
deleted file mode 100644
index 56ede364e547..000000000000
--- a/app-text/gentoo-guide-xml-dtd/files/ent/iso-pub.ent
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- 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
deleted file mode 100644
index eff2db9d8bc9..000000000000
--- a/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- 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
deleted file mode 100644
index eab05a0c6c58..000000000000
--- a/app-text/gentoo-guide-xml-dtd/files/guide/guide.dtd
+++ /dev/null
@@ -1,274 +0,0 @@
-<!-- *********************************************************************
-     *** THIS IS THE FLATTENED DTD. DO NOT EDIT THIS DTD BY HAND, EDIT ***
-     *** THE CUSTOMIZATION LAYER AND REGNERATE THE FLATTENED DTD! ********
-     ********************************************************************* -->
-
-<!-- ====================================================================== -->
-
-<!-- Gentoo Guide XML V1.0 DTD
-     Copyright (C) 2001 Gentoo Foundation
-     http://www.gentoo.org/gentoo/guide
-
-     See COPYRIGHT for more information
-
-     Please direct all questions and comments about this DTD to
-     Achim Gottinger <achim@gentoo.org>.
-
-     Common declaration:
-
-     <?xml version="1.0"?>
-     <!DOCTYPE guide
-       PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN"
-       "http://www.gentoo.org/gentoo/guide/guide.dtd">
-                                                                            -->
-<!-- ====================================================================== -->
-<!ENTITY lt	"&#60;">
-<!ENTITY gt	 "&#62;">
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % URI "CDATA">
-<!ENTITY % Character "CDATA">
-<!ENTITY % Text "CDATA">
-
-<!--================== Imported Names ====================================-->
-
-<!-- Parameter Entities -->
-
-<!ENTITY % list "UL | OL">
-
-<!ENTITY % preformatted "PRE">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
- -->
-
- <!--=================== Generic Attributes ===============================-->
-
- <!ENTITY % coreattrs "id ID #IMPLIED">
- <!ENTITY % attrs "%coreattrs;">
-
- <!ENTITY % align "align (left|center|right|justify)  #IMPLIED">
-
- <!--=================== Text Markup ======================================-->
-
- <!ENTITY % fontstyle "I | B">
- <!ENTITY % phrase "CODE">
- <!ENTITY % special "A | IMG | BR | FONT">
- <!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special;">
-<!ELEMENT I  (%inline;)*>
-<!ATTLIST I %attrs;>
-<!ELEMENT B  (%inline;)*>
-<!ATTLIST B %attrs;>
-<!ELEMENT CODE  (%inline;)*>
-<!ATTLIST CODE %attrs;>
-
-<!ELEMENT FONT (%inline;)*>
-<!ATTLIST FONT
-  %coreattrs;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT BR EMPTY>
-
-<!--================== HTML content models ===============================-->
-
-<!ENTITY % block "P | %preformatted; | %list; | TABLE">
-<!ENTITY % flow "%inline; | %block;">
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT BODY (%flow;)* >
-<!ATTLIST BODY
-  %attrs;
->
-
-<!--================== The Anchor Element ================================-->
-
-<!ELEMENT A (%inline;)*>
-<!ATTLIST A
-    %attrs;
-    name  CDATA  #IMPLIED
-    href  %URI;  #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!ENTITY % Length "CDATA">
-
-<!ENTITY % Pixels "CDATA">
-
-<!ENTITY % IAlign "(top|middle|bottom|left|right)">
-
-<!ELEMENT IMG EMPTY>
-<!ATTLIST IMG
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #IMPLIED
-  name    CDATA          #IMPLIED
-  height   %Length;       #IMPLIED
-  width     %Length;       #IMPLIED
-  align      %IAlign;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT P (%inline;)*>
-<!ATTLIST P
-  %attrs;
-  %align;
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- excludes markup for images and changes in font size -->
-<!ENTITY % pre.exclusion "IMG">
-
-<!ELEMENT PRE (#PCDATA | A | BR | FONT | %fontstyle; | %phrase;)*>
-<!ATTLIST PRE
-  %attrs;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- definition lists - DT for term, DD for its definition -->
-
-<!ELEMENT DL  (DT|DD)+>
-<!ATTLIST DL
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT DT (%inline;)*>
-<!ATTLIST DT
-  %attrs;
-  >
-
-<!ELEMENT DD (%flow;)*>
-<!ATTLIST DD
-  %attrs;
-  >
-
-<!-- Ordered lists (OL) Numbering style
-
-    1   arablic numbers     1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
-
-    This can't be expressed directly in SGML due to case folding.
--->
-
-<!ENTITY % OLStyle "CDATA">
-
-<!ELEMENT OL  (LI)+>
-<!ATTLIST OL
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       NMTOKEN         #IMPLIED
-  >
-
-<!-- Unordered Lists (UL) bullet styles -->
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!ELEMENT UL (LI)+>
-<!ATTLIST UL
-  %attrs;
-  type        %ULStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  >
-
-<!ENTITY % LIStyle "CDATA">
-
-<!ELEMENT LI  (%flow;)*>
-<!ATTLIST LI
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       NMTOKEN     #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
- <!-- horizontal alignment attributes for cell contents -->
-<!ENTITY % cellhalign  "align      (left|center|right|justify|char) #IMPLIED">
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign "valign (top|middle|bottom|baseline) #IMPLIED">
-
-<!ELEMENT TABLE (TR+)>
-<!ATTLIST TABLE
-  %attrs;
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ELEMENT TR (TH|TD)+>
-<!ATTLIST TR
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
-
-<!ELEMENT TH  (%flow;)*>
-<!ATTLIST TH
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
-<!ELEMENT TD  (%flow;)*>
-<!ATTLIST TD
-  %attrs;
-  rowspan    NMTOKEN #IMPLIED
-  colspan    NMTOKEN  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
-<!--===================== Gentoo Specific =================================-->
-
-<!ELEMENT TITLE (#PCDATA)>
-<!ELEMENT AUTHOR (#PCDATA)>
-<!ATTLIST AUTHOR
-    title %Text; #IMPLIED
-    email %Text; #IMPLIED
->
-<!ELEMENT DATE (#PCDATA)>
-<!ELEMENT VERSION (#PCDATA)>
-<!ELEMENT ABSTRACT (#PCDATA)>
-<!ELEMENT CHAPTER (TITLE,SECTION+)>
-<!ATTLIST CHAPTER
-    link %Text; #IMPLIED
-    >
-
-<!ELEMENT SECTION (TITLE, BODY)>
-<!ELEMENT GUIDE (TITLE, (AUTHOR+ & DATE & VERSION? & ABSTRACT?),CHAPTER+)>
diff --git a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
deleted file mode 100644
index a9e995d76535..000000000000
--- a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-S=${WORKDIR}
-DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
-HOMEPAGE="https://www.gentoo.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc s390 sparc x86"
-IUSE=""
-
-DEPEND=">=app-text/sgml-common-0.6.1"
-
-src_unpack() {
-	# Nothing to unpack
-	return 0
-}
-
-src_install () {
-
-	cd ${FILESDIR}
-
-	insinto /usr/share/sgml/guide
-	doins catalog
-	insinto /usr/share/sgml/guide/ent
-	doins ent/*.ent
-	insinto /usr/share/sgml/guide/xml-dtd-2.1
-	newins guide/guide-2.1.dtd guide.dtd
-
-}
-
-sgml-catalog_cat_include "/etc/sgml/gentoo-guide.cat" \
-	"/usr/share/sgml/guide/catalog"
diff --git a/app-text/gentoo-guide-xml-dtd/metadata.xml b/app-text/gentoo-guide-xml-dtd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/gentoo-guide-xml-dtd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index cdde5cca36b6..dbcf0a47ddb7 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,5 @@
 DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
+DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 EBUILD gspell-1.4.2.ebuild 984 BLAKE2B 34d49bf58ed3d59cbb94f95739fa8e03985f3e93be328251e5f1a080ea2e0eec734e9ab036e096f37c873da24c4fdea98c09b98bb010d9c9fc7b455e6ef7ad74 SHA512 43c47b3b112301aa1876e805999bb1631f6add794a7ab68d5ba162f7d12b741fadf2486458294f4b2b5bfd78f3143d9f9ca16631ba8020aad92ff1fbefc2cd92
+EBUILD gspell-1.6.1.ebuild 1006 BLAKE2B 411c9733da9d9c1b391fa9b1870a3e5cfcba4e87ca7d7ed921c735568ae93e155164e2b014e20d9b0eaa64abb50e28541611308720b2653eb47b794808254505 SHA512 dd4c5aa2efeb64e726baf14d4797a06d344d9f3f3872eb6caa2fb300e4070d3c3ea7bde773b6474c4f253e907491504b88132a474ae46bfb7b814e9918740d9d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
new file mode 100644
index 000000000000..483713d17e13
--- /dev/null
+++ b/app-text/gspell/gspell-1.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-fbsd"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=app-text/enchant-1.6.0
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 2d9bd08504a4..349daccfc2cd 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,3 @@
-DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
-EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
-EBUILD iso-codes-3.76.ebuild 2427 BLAKE2B c7f21f1e7f5f39dfb674baf5d5323873cdf04bb862f1467791da98de4daf373ff1ddd4d38af7bf8cf4b1ee79dc1b323b9a999d3ee6d0cc28aa3bda41e081b5af SHA512 363630a9ceff8cfd91882fd88e8e88083ff0be0fbace18a8b623421889b6763c364e2174fd27c581df265ddb5a6579d7fb780983248cde6bbd36e06e2c092480
+EBUILD iso-codes-3.76.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
deleted file mode 100644
index b5a8f0e064c3..000000000000
--- a/app-text/iso-codes/iso-codes-3.75.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-# l10n_find_plocales_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
-	local std loc all_locales=()
-
-	ebegin "Looking for new locales"
-	for std in "${all_stds[@]}"; do
-		pushd "${std}" >/dev/null || die
-		for loc in *.po; do
-			all_locales+=( "${loc%.po}" )
-		done
-		popd >/dev/null
-	done
-
-	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
-	if [[ ${PLOCALES} != "${all_locales}" ]]; then
-		eend 1
-		eerror "There are changes in locales! This ebuild should be updated to:"
-		eerror "PLOCALES=\"${all_locales}\""
-		die "Update PLOCALES in the ebuild"
-	else
-		eend 0
-	fi
-}
-
-src_prepare() {
-	default
-
-	local std loc mylinguas
-	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
-	check_existing_locales
-
-	# Modify the Makefiles so they only install requested locales.
-	for std in "${all_stds[@]}"; do
-		einfo "Preparing ${std} ..."
-		pushd "${std}" >/dev/null || die
-		mylinguas=()
-		for loc in *.po; do
-			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
-				mylinguas+=( "${loc}" )
-			fi
-		done
-
-		sed \
-			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
-			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
-			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
-		popd >/dev/null
-	done
-}
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index e445ec26b7f1..b5a8f0e064c3 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 8a632499dd54..afb8eaed2cfc 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,3 @@
 DIST libnumbertext-1.0.tar.gz 408181 BLAKE2B ceeba0a98c0d6fbfa92ad37347f7b7cb9887ea516126e35212d61e572a382a56c520406409e08024d53f1520219ec7e986324893b1c2b53330a217319d35ffc7 SHA512 b30f3650ba8cbaa771415026f40b7fc2cf5d9cd956a365d6654b1e2996fe61f714adfda845432e41f61f0fa474b1b60d99cc46cd6b7e42e1dccfd53f5017ae63
-EBUILD libnumbertext-1.0.ebuild 594 BLAKE2B dcdd03a0af68ce2e8c3965e189d25d8ee4aec77495169dff79d70dc284db7eb5369820caa707705b2c25728940d004dc14d2fa5e1f889701aff19cc056a73b0d SHA512 1fb69bce0a78b4eaccba9d706b6deee4fdf1ea8cfd690a35102bf78d5a9caf44ea03cadfa5301fcc4ae21dc4664227c5f6371ebb5fa73a555fa1ad63d90b7eb3
+EBUILD libnumbertext-1.0.ebuild 599 BLAKE2B 84589619a58bb79e7a845ae81bffc6a23542a7b78658a0ef310f20156efa662b2d847cbd232960e9a6a4eb7c72f7f6c79eb02f65541db4bad1b6c9f209c6bdf1 SHA512 8aed589c9a38371b3b13c17a1159fa0c739bbf3262a968b4fd03b081ee8d55b37ddd8eb3443b4fb883ae82c2968baa0e5eae9a12d19a408bcaeeb77d87c07e62
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.ebuild b/app-text/libnumbertext/libnumbertext-1.0.ebuild
index ad6d58d47ebb..e8f54fa9d101 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 7fa83b8bfe7f..e794d047ea5c 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996.ebuild 1133 BLAKE2B ddc7e387dc68793f75bc7a58132d0f99a8fe1820c733560209bf2730ebadd70a38715f82dc3d1f779272870ce7fea0323bd0890b2d18f641d9fe13c9e12f0a11 SHA512 93658fdd5a23235aecaf8b4a415be8c2fe21c0d7ba89f8f77b4a5f1d7475091c1f3d86d0892bafb20d17b8bfd963b930556d09349aa944a341a9ac357cfe4a67
+EBUILD mecab-0.996-r1.ebuild 1177 BLAKE2B 18b4d1070b00d682411d1908312c4e01e700af26aaddfc3d8e3f0f10e4ca5b2ff2ff023723b7eb9d673c09052a710cc33d507bcf61036e6dfa91a27fc476194b SHA512 5cbf8c0f4caa80fbce2a4148113d74ada27fd9b2733cfb6c616e5bc836e54a608f9e1f3c658f9efb3d4f080e2e97203248264b406bf7fefd3a37b3e12f032d59
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index bbe997169300..240f68aa5a54 100644
--- a/app-text/mecab/mecab-0.996.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -30,9 +30,10 @@ src_prepare() {
 	sed -i \
 		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
+		configure.in
+	sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index ccd80455eaa7..562dd6f25b83 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -6,12 +6,15 @@ AUX mupdf-1.11-openssl-curl-x11-r1.patch 1087 BLAKE2B 919a3fd6e955f8aee13e0bbce1
 AUX mupdf-1.11-openssl-curl-x11.patch 1087 BLAKE2B b56dde0f5f150d1697562b96e3bfdc1a004ba6fbb50ce2fd3561c3d1f1c5c9ec5b10ec789eaed7d0b73ed1c24a4025c7e99b3ed056513be0fc31607abd9a9f33 SHA512 f3441a4ef5548e11adda6984ed84c6fe6d337a9ac3b17456b8b1b620e51f134fd39f5cef969ffe43b1a3025b3b6026b7cfc6d7fcdccc464859e3bf931d253c82
 AUX mupdf-1.11-system-glfw.patch 288 BLAKE2B 809aaed6098f59f555b14b80cb7576bd77b6cc781f07b387f720d8a74446fc44d74f5fc87f252b12cfa07495e7cbbc872bb20250290896d798d7b792c1ed6e3f SHA512 8331c72323011be2905383af3e0d76653d2a8551da3b815730aa8287494d6f867cc82bc8e2ba9ca2f5bdbb301ca3aba775c946019567957246bab1a852cda75f
 AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
+AUX mupdf-1.13-openssl-curl-x11.patch 1184 BLAKE2B 27428b976a8f3854f16968fa5b70d0c4df0fb24508bea3c214fd5a0e46b3c43129ab0953ff20f55b23080de54ae6c5760f7eb97b53195794350a832219449acc SHA512 46f28dc5b23831c7125e42224acf16fc4a6cb90a03f719d2bd423d92e22280689bd3d7dc634d123050c2762333062916712cc951634ec5e5a7d2d4fcef7ebabf
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 AUX mupdf-1.9a-debug-build.patch 159 BLAKE2B da7e5294cb9e348d057d1436d68c6d3ce62aff7d7e0923c1b3c492c8dbaa459f26894c9c0c3c83e6885b7607c42f8c3da68e646f0dee3f83a168c7caab236f39 SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb
 DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 2a9991a11355a449b91955bd897b5da175d3a89943277345779ea52c74f57c58226ee4087b23e3f434c0a45ae7a39df95c81c26c55d959f362bd1a0d0216716d SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
 DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf SHA512 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
 EBUILD mupdf-1.11-r1.ebuild 4650 BLAKE2B f68c39d06fae959cc37de3a6eb03758f3b146eda42253a795b48ba56ddb887f76eb79d901745fe4b6ff16924436f3fd4699b4065ed7d1a33bf605dd8f4265173 SHA512 4c2b3d4c568b42335177ccd975b11e044a0887d6541c2b78f7b3d43b1bc9030dd35f1ff4d8c3c2d4278c3e06b78ee2acab975eeff2dc5c00516575dfad436b6e
 EBUILD mupdf-1.11-r2.ebuild 4773 BLAKE2B d30970c3d275a44ff46a971b707cba9f17d2d4da24e1699cac848be97fc82fb5433a8a09166239b67a3764d13843b91683f93ff0e604fffde27e18d9bb500e7e SHA512 af89cdf6f3a595b424c67225cfa57b9c6811b4cbd9d1cb032bcadf98468aacbce00a78d4479592477bcdc3f6ad6f14703b4ea3aeda3820be7d8893ce506e2214
 EBUILD mupdf-1.12.0-r2.ebuild 5150 BLAKE2B b259c4eac6cc8e9e8aece1409227eedb8c57121a4e67b007ddaf8d952cede3cc078b125a13abbe1b90243075e71259344a032ade0259f07e9435966b8391995a SHA512 9bfce240ca26490e268b2e9076f12cdd5dce2cbc85e943a423e24c0adb5485bf32e0de9ba28bf62e8b43da04953819baea2fdd0e8814c6de4eee1b9cd6ef1eda
 EBUILD mupdf-1.12.0.ebuild 5060 BLAKE2B d68da2df2e328e4f96560d28dc8a79b7cdcbc5be7761513cac5dce3f9cc01a09083c11dea7ced2b8ab4cf41a788eb4a80b890e683e2178b6caed48dd758273c3 SHA512 42bf1fec67bbee0aa84a20614d322640f4c92c54eb947f35957886111834031d4a45994aaf39ba4ea08c709823475bede42c9dc4b49099929414ce587e8eb020
+EBUILD mupdf-1.13.0.ebuild 5148 BLAKE2B 4836ab82ae27c5aec001d0cc3e984eeef17a3ef964f19a43be2fe1d122edc10fa6b73450e8528ddc76cce8721bd5d990bba7249b6b8d6e40d05d2d1796a83863 SHA512 43c6695a9ebfd52ce9e8442f1fd632418bd9bdb55412e35c26fff1f58f42abd50ec985e14007cf1204977e0ac7edc2f002cd661d15fbe901087fbe82efe1b734
 MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
diff --git a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
new file mode 100644
index 000000000000..6db51a083edb
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
@@ -0,0 +1,39 @@
+diff --git a/Makerules b/Makerules
+index ef2b6b0..f9b25d6 100644
+--- a/Makerules
++++ b/Makerules
+@@ -104,12 +104,17 @@ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS :=
+ SYS_GLUT_LIBS := -lglut -lGL
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -121,12 +126,16 @@ SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
++endif
+ 
++WANT_X11 ?= yes
++ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild b/app-text/mupdf/mupdf-1.13.0.ebuild
new file mode 100644
index 000000000000..731ec1534b1f
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/freeglut-3.0.0:= )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.13-openssl-curl-x11.patch
+		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	# specialized lcms2, keep it if wanted inside lubmupdfthird
+	if ! use lcms ; then
+		rm -rf thirdparty/lcms2
+	fi
+
+	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
+	for my_third in thirdparty/* ; do
+		ewarn "Bundled thirdparty lib: ${my_third}"
+	done
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	use lcms && emake XCFLAGS="-fpic" third
+	emake XCFLAGS="-fpic" \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 0873acb9ccd2..e33c180e887c 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -3,5 +3,6 @@ DIST paperwork-1.2.3.tar.gz 8120802 BLAKE2B 8af1b9ff1f7049b0be04186a9b658804283c
 DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
 EBUILD paperwork-1.2.2.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
 EBUILD paperwork-1.2.3.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
+EBUILD paperwork-1.2.4-r1.ebuild 927 BLAKE2B 1fdda901f0fcb17bbe56baae0dc5474bc55967257dfb30ac39ff479e4f5de120d1ed8194894097f31b104df98945772612b50d3cdfdbc6f823bef5517cf09d98 SHA512 2db92699b349fc02438f612c17e00d6daf9e03e2d02a36fcedaca0ec2f41ca860e64a52283131fbf0cc23579b4286eeeff7ba1137b75f628a8c7a8aea82d7d7e
 EBUILD paperwork-1.2.4.ebuild 964 BLAKE2B 3bc143a98fdf0962e620d97fa129d73a8a9207536961532b394c1a31fdb0c29c42e4a1b7ea99a325bb8ecdb6fdfcd92874e54aa8813c78054280f09495f2d77d SHA512 d93c4389df13158f99780d085211c9e18fde0f57ee9ee54c94c87f79537ecf1f907016546b4023e1395f4a9851ba431252f4d7068c32442d105950963ee2fe33
 MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/paperwork-1.2.4-r1.ebuild b/app-text/paperwork/paperwork-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..9156358a08b7
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.2.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinsane:2[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 3f57fb454ab6..401848429263 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,4 +1,6 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
+DIST po4a-0.54.tar.gz 2686485 BLAKE2B f33f1e27bd24e4429ef8edbdd999333714e9a50e4af2c60ccffec91098bf330776c4ee9de9b6d4cdb459b67a26a1a6e4b8a0ead7efa82fe97584405a15245ef4 SHA512 5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.47-r1.ebuild 1650 BLAKE2B cd8722f1395fa346d5caeea4d93f589c52ac3f2090cd0aa7d8793fb859cb7527108daef206d4e9220cd41a0a3a44c59d606fd5f2a918e7b96ce42c52aef31b5b SHA512 28763203b7bd298066eeb6a5ce4d26b740a4a4012a22e3558c5d24896afc3ed001208dcfecc00e82417a55aa6b2827df695365b847cfc361f4d4722cbe2f3748
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD po4a-0.54.ebuild 1255 BLAKE2B 48e731fd7b249a611979055cfe27a235948ba4295496bdcc7ddf7e15caf5c18caab66c1e8b161045ca559d340a116ce96db65558cfacc38c1f2156e7aa87dc92 SHA512 001803eb00fecf849ce167bc90e63c1b0ada849c08c91e9ca6a889daeaaa06338b522d31ce96fad005ca2ba7c73b779bb21d4578b19888633d5ff370890c04e3
+MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
index 6f49eba8f496..c1b8da0d8d0e 100644
--- a/app-text/po4a/metadata.xml
+++ b/app-text/po4a/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mquinson/po4a</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/po4a/po4a-0.54.ebuild b/app-text/po4a/po4a-0.54.ebuild
new file mode 100644
index 000000000000..52fdda5fc38b
--- /dev/null
+++ b/app-text/po4a/po4a-0.54.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
+
+inherit perl-module l10n
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		virtual/tex-base
+	)"
+
+PERL_RM_FILES=(
+	t/09-html.t
+)
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 9ed6a6b11d79..d0e7957da24d 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,6 +1,8 @@
 AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abacf43ddaa42e80345f3b4646ab8a60cf8d05861601047b9e962b4b289735d6b8ca59308c4de205fd145e5d17b5052b4ecf94cd78e9483dfdda1ec SHA512 cbe44430c0a4511afaa43d41e1c0e5d02cb7f805a6ca4d8f8f9adada26e01bb2bb43c327c0b78ccdc26103dd4abfa7d9c8b5ed2c61401d4c587cb12c1ad5d3bb
+DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
 DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
+EBUILD podofo-0.9.6_p20180715.ebuild 4472 BLAKE2B 31b2f8b870f17715c8393f30cb61e4622ad0ce4463b7f5fb60be64880804ebbbad1336531710ec829c43b730688c1fe42a063f72edb529a8831d951fd87aaa8c SHA512 90f1499b1a1b27b7f905f7951f6ea5ed46ef13e6dba58c102dd3213b93bae4fee410a967a35b39219bb39fd0e3495e45d51429e389771a46963939ad1eb469cb
 EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
 EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
new file mode 100644
index 000000000000..7f9639761070
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV%_*}"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn libressl debug test +tools"
+REQUIRED_USE="test? ( tools )"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	local x sed_args
+
+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+		)
+
+	cmake-utils_src_configure
+	mkdir -p "${S}/test/TokenizerTest/objects" || die
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}"/test/unit
+	./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/rhyme/Manifest b/app-text/rhyme/Manifest
deleted file mode 100644
index c754e7726e2b..000000000000
--- a/app-text/rhyme/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rhyme-0.9.tar.gz 896013 BLAKE2B d163013a0507fae2c2094076fe77f3ff6be252968e38adb97734ae7ada16407ef2f47ebdded9e7a0c06207514923e0bd881968c9a5088d715e1ecb4b1fc03c09 SHA512 a769313c4790eae94eca1ecf8c00459b9d74e6437d339f8dc9f6642eea51258a0fc2541877a68eeb3a897c29877b673be17826450c1da5a2352a61266784d0fb
-EBUILD rhyme-0.9-r1.ebuild 971 BLAKE2B 3948b8e3087b94ff3a640f61288354dde7edccddec5c971633c07bf2536146a460c0a1b8de3022927454a1de5524068624234fcff93e01280c3b079375c85901 SHA512 7d5bdad5eff4b3a4d31cfbab65e38971b6cc41756cfaf2f7d210a89a7c98b78569c59db670f8de5dcc23aa2bf254a9b280b365efbe3f3ec83259b011f6a45f9c
-MISC metadata.xml 667 BLAKE2B 0a3c441145a0dbdfdbba7fbce7bc3fa8f1bba7abfa5a50b1edf26fed70535812be42deff9f38641f8f59779f025f0d2c37c115fe5ce9238a50c6635363ac386d SHA512 c63a131298491268402524a8efed010e464393ccc19343cc966d5c2b39d3e69b890264902614f3a2ba18eeb253faf7624b9fe488b3b501e04122d8841e7caac6
diff --git a/app-text/rhyme/metadata.xml b/app-text/rhyme/metadata.xml
deleted file mode 100644
index aa21005d2367..000000000000
--- a/app-text/rhyme/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		What is this thing? Why it's a rhyming dictionary, of course! But more
-		specifically, it's a command-line program that takes a word and returns
-		to you a formatted list of all words that rhyme with it. The default
-		response is a perfect rhyme (which is probably what you want). Or you
-		can get a syllable count of a certain word ("whitening" has 2-3
-		syllables, etc.).
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">rhyme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/rhyme/rhyme-0.9-r1.ebuild b/app-text/rhyme/rhyme-0.9-r1.ebuild
deleted file mode 100644
index 660464e5c6ba..000000000000
--- a/app-text/rhyme/rhyme-0.9-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-# missing files ...
-RESTRICT="test"
-
-DESCRIPTION="Console based Rhyming Dictionary"
-HOMEPAGE="http://rhyme.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rhyme/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/readline-4.3
-	>=sys-libs/gdbm-1.8.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# termcap is used by default, switch to ncurses
-	sed -i Makefile \
-		-e 's|-ltermcap||g' \
-		-e 's|-o rhyme|$(LDFLAGS) &|g' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	# Disable parallell building wrt bug #125967
-	emake -j1 CC="$(tc-getCC)" FLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	# author doesnt use -D for install
-	dodir /usr/share/rhyme /usr/bin /usr/share/man/man1
-
-	einstall BINPATH="${D}"/usr/bin \
-			MANPATH="${D}"/usr/share/man/man1 \
-			RHYMEPATH="${D}"/usr/share/rhyme
-}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 15b7be7d307a..822d95d3341c 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -160,5 +160,5 @@ DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf447
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B 1285fa47a8f24b7f055728e71e83208e21687491063b3edba33fbc254f92f5d5c20e899ded68ec8b4fd9200025bb4c88ab3c24e3e3c5a3bfc68dcdb33fc42af2 SHA512 0f2f0d97ff0933bb680a5a591d34b63b9c898dda27e908e7404ab0ffe7190d620b70a9900945c556cd5269944f46986681bdb94ebef8ece7dede2679651eae73
-EBUILD texlive-core-2017-r4.ebuild 11812 BLAKE2B 86f9ac4f8494198b2a999e649f7e3939a2b80a890d6c2e6b8d8f2305f7265db0513ce642b1bac009b0c890d27e8b896d2188331521789c4aee08cd4fa85d1900 SHA512 98237d49c07281b4b0b64961a8ef18fcab3cc813ddcd8fbeba86e8091134409cfe9d32db195e670216f3535bf2c5fadccc68d63b26c9b0cbdafe6a1eb4f13cf5
+EBUILD texlive-core-2017-r4.ebuild 11811 BLAKE2B 9478846ecf0d8a375ce08f6b1d67d4a701119c2b81f7e2378c3353e1e89c3a38d2a011cb8e1801cb6e0c37f582f26de74f942759e2dcd089268b77cb7871f006 SHA512 e2b6d392fe780dd1262d5e8234da06bed0c64e7d674d301fffe23be5b8d0c7e25dc1acdd7e546bc217a74caa238d097ac7cbc05e48032f4e6bcdfb4e90660321
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 91c57eca22d6..30f93b013f8f 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -76,7 +76,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index d6b08bb7742a..649037ffd29c 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -4,6 +4,6 @@ AUX wgetpaste-config-services 105 BLAKE2B b2ee82eb523622a46b7b9922276703a3afa15f
 DIST wgetpaste-2.25.tar.bz2 11107 BLAKE2B 1ed46ada9045326583900a78bbbd66ea7776ae7ae7191b14f258ef417ef65c344d6ff7e6c5ac0592d93c2936bc189ea0a33c18a8f2e6a0eb9e4e1d9d3b67701b SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e
 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
 EBUILD wgetpaste-2.25-r3.ebuild 919 BLAKE2B a6b04fa999c708d990d074e5e40465e6bf518b6728423a1ee2c125911d7124fd466696f9c048b1c55ffc521c50767a95145f102a97ceb4eefdc8b8fc08bfd387 SHA512 749f899f89c0f1ba27b2fd937297fb2b27e4d749a7c232b8274fe89d530aa03082da70019bb120a8fb58fa74ee8180f437c0dcab4f427d487d3b16eb8408ffe6
-EBUILD wgetpaste-2.28-r1.ebuild 734 BLAKE2B 9728c2dbbe50713b394897d292e42e5971e3070ec229bd8612438a0b9656ab03f7c0db071b15cb8d7e3420e88adb0c787b554c9ef6bb6f8094a606fea98dae18 SHA512 c67fbd0e5dbf8963525af996e74f9b2f17d3aaeef741c5e924a5f319d217b86cac61ef3f9b1098912bb5fbc8ea1c3c968aaabfc2e135877aad843ef2bdb4c05f
+EBUILD wgetpaste-2.28-r1.ebuild 733 BLAKE2B b11cbdcdc7cb9fb600d5fcd4a502c6fab57502fdeb994a77df26dbc73398e44d4121cb8455f43b7823f2d6a20a234ab54a12421d758e29e14e071c3744f2c01e SHA512 6cfb7ae835d840368b7ddbe98ee6b318b07c229313e1e78cb10fca1899ed4eed366830f99c38718d3312a707c28f4ffd91b549eb80ac25a10fad118ac04a11af
 EBUILD wgetpaste-2.28.ebuild 706 BLAKE2B 69fce5b98143b44c27536b84e2d09f71d742dd39394cc57d0d4f40250cce44506326edc5f93c603fdbd09460147e953e38afecc31f6ae0afa0f4be7d50b9f124 SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41
 MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
index 179987690480..57bf3e74861c 100644
--- a/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index b65e5483f05e..d4c7eaec72dc 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -7,7 +7,7 @@ DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a7459361
 EBUILD xapian-omega-1.2.24.ebuild 1265 BLAKE2B 3208b0fbbacfe32abde89176a4f4615a9cc848e7f37a9f23333309da9804b457713a9a7b774d62d97043701813996ce53abb689bf944ca1cec1262510f61156d SHA512 8f8902b4d7843bb2a70e1c673b6aa78e5fa17f248709a9c62d03ff65c3a47784b98110ac8c3f73dfc8772f58094b96ceea41b11c7ddac17744714fbde6c55674
 EBUILD xapian-omega-1.2.25.ebuild 1273 BLAKE2B f57b3917eb6e9f37879b55d1e759e529c84901b237c673a5093acd2ef5d5117ed279d310995f2709e066f2e6f03e9a3cd6b4cccb2bea2faaa5adcfd03da93277 SHA512 b9a29ac4b8bfdacc219d171a088e1a05e3b092744317d33f197ef77415007ee589d89ee3512a937b4a0c63c781d3a319e05cc3ea7ae89aa5770d6a258784bc38
 EBUILD xapian-omega-1.4.4.ebuild 1156 BLAKE2B 04daef4ad0d3cdac10fc657b54cb5d21c5fa445561a51b1add18db624ec97ad43531597ffce51648ec978fc39f57760c61e1b120cf660a1e8b452470311f2a97 SHA512 006fdcf2159d49895786895245f7236dda96d81fea5e6b80d707083a7cc17153aec1969c1a30a6677a0b67e39ee53376eb507a9a7efacc12057b8dba070fcb66
-EBUILD xapian-omega-1.4.5.ebuild 1155 BLAKE2B 6671be7b3f0b290a0576ed0818db81e3533d87f1cbc7a9329d9bb093e842f41a028d72157315ae040b8d118f5d3b2396ea1b670266a16319a1c09ee1253ff8a3 SHA512 d1f6125975790b2ef9f80f9b0e942c915444bd92fb08ac98858e30fd25eb973f618771dd35f62e792f75bdaa7fb127b47e0a08443d53ae4202cb1a135f6f4ae2
+EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.6.ebuild 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
 EBUILD xapian-omega-1.4.7.ebuild 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
index 47d14797d720..eb4d381967b4 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index a31e2acfdd50..7a666a6a29b1 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
 DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
 EBUILD zathura-cb-0.1.6.ebuild 1169 BLAKE2B 48bdabc0538c032080e8e25ad9b32e8114a7387ea772453e83382368bbc6b524245f02adc55afb75825cefd11108b00d62cfd7e09051ae224f022b961b11acbc SHA512 00d8287f33cd414bb78c34a682645e444eb84f59b58cac5ac4d6290f23fdba1c07f5894383747e253ced4cfe5128d28e250394239fcde54901a9ac0f401df6e3
-EBUILD zathura-cb-0.1.7.ebuild 1192 BLAKE2B 40ab3a5b2d465a29f06ae511ed608520a70425e980e19e1ea5cba0b2e5b6863841e3f832680ac054773ef6487b00b27155f0b512a28fe3c847514b6e168426d1 SHA512 db692f30c3688e5dd3999b768edefac58cd1653e46449ac95dc2bf248454d4d997a4a65f40dbc59562ca3c1744e485f73aa373aa22d79d4560d74f3dcca229da
+EBUILD zathura-cb-0.1.7.ebuild 1191 BLAKE2B 12a7784c95acc44a25ad571fa203063c332ad91af7d8c8b1533b0a9dc84350c4e9a07ba1fb81b37bf78178d4ea3b01e267185a3dba8a4a10d3dacc98bd3868b7 SHA512 8d1d8fbdc1e54f4238fa8e31df10c71662c194ec60b63eea32085276b86b9de115c9539c5f6260aadfc88a95bee1b6c3116badf83eb6e1e2c4d0603bfc256220
 EBUILD zathura-cb-9999.ebuild 1194 BLAKE2B e45d6a066522374b807e917b6baca20ea91897a1b5cc99a2caccd2e9dedf5853774749a53c9c3009e4de36f2036bd09d14d7cb01cb7bfbb663c2d31f8b4b92eb SHA512 00eeca9e086cf608309fd780cf376cc40c5580de57ad42d79fc77bcc012ad799cb8dfce4530f3069e4a28b196925090b25e3a6882cae4b7ce121900798e63a29
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
index bb222a057113..1fff9b735815 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 51c88c241b46..ef7b7b8ab83a 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-djvu-0.2.6.tar.gz 11137 BLAKE2B 23efc23cd53068abb3e118d6dc9b1e875c3f292d2e7ab49abbf6c599d6241c37959e9f74ac2b0f06838cadca0a07e39e1dda2e188f6861b72d4cd7a4bb1fcc62 SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac
 DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
 EBUILD zathura-djvu-0.2.6.ebuild 869 BLAKE2B e808ea94258c503b48549c6dd56c1f037454ef06721b3c703ee20665dd14560765d02e0f838a3d79cce7f642c0b2fedb9bb11b848ce346fb2af1f685b4dfb377 SHA512 dabaa16d72e7281c7ed9cf8deda8fb011401127f671738bcbc1f9c370bd16147acfe716c01a5e1011be19f4bda718eda25800cdc7728f52c6ea475febcde2ce0
-EBUILD zathura-djvu-0.2.7.ebuild 874 BLAKE2B 50f207c61625f4f2e5569ad5f961fd3dd6643e639c243cb100e027e44e92a3adbccbd5489d085eec4edbfada291ef5a1cbe4ebbd9bcf32339903bd91c9285e11 SHA512 f1c0d7acbb3b39b044ab87a27a7ebe76912ed55cb87f7ade7d19926a4e32cea6009896e86a6348bcd527757292ca0aab70dc173dbdccb51d057711a8b1f2ffd3
+EBUILD zathura-djvu-0.2.7.ebuild 873 BLAKE2B c7329a9562bcd883ba1cfc042bea476d9a40a243f9d493704fd7655362c1e8c4a4fe6aeae5b509014db4a7a3d8e7323565d727aacc64a2ecdbc8271dcab53444 SHA512 616e7310f5bd94394546dd4cb624ee5c0a9b384064593a6d3098d11cc8669c3417e999e9adfc2c4b1f5a55256535f1633b8d6f644ce9772dd70b967a144bc32f
 EBUILD zathura-djvu-9999.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
index 67cdfe31ae92..528afa9e57d9 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index ccf91c29c90d..8601fd80ebc3 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
 DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
 EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1095 BLAKE2B 1c8506329cb6b56e46f53522990271aeb72afd30b38301cb1443fa8808460af81810713958c6f55f1fd79a635426d89812511b9ac8a5441020cc483a7b068284 SHA512 a8eb48a9029089008b9925d946d909a21802275a23a0e33edf67780c028fd1a7c8432438bc3aaac3b8460d40d0f7df8b9219bd8af5c99c6eb98339510e7c0479
-EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1075 BLAKE2B 1ffa737a7111bb24a314443f6da4e6bc69b2077ea5d1b080b83f0335aa7df897c5c9216c497f533dd3a6e59f243f9267ac88a9b7e348852a7d7c547520fa1adb SHA512 20828e21b1b6255a5c05ac42594ce1b8d6749920cf5490e4a174947734d77b4ea048ef894d5271dfe3900ffdfefa7d5ddc3daf6fb5be1fdc5b3f1853f1c01aa2
+EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B 33d9faf3af3156f08f3a2ac764c3ef16c2fc32b31ff396eafe1027663d0464f735ba0349423e9a173aeb84498a5da7d3fe13606ae2e46a10eb5b20fa0bc5a08b SHA512 99caf865cbc7751aec41b38e1d179d52bed4523c1813554413b4631fda9318726cffdb476de2777fe35f80ee463c2364437e1b30e80271b79c106ad7f5b5bb11
 EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
index cb18bcab1632..93ca970998ab 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 3e81a2e72e22..c8e7ebf6b246 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
 DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
 EBUILD zathura-pdf-poppler-0.2.7.ebuild 854 BLAKE2B 48cd2dbd815496570c0826fb6f265b5b983f203689a5351c3a0a948ed9cd61d3b515940c755a2c297dbe294b6fd8b9cc732970ed2e24d7181d43a3a235a39f41 SHA512 8f1064fd8da384e347980adaf2370ea1e60eab857e50038ca16718768ccab732cfb95d5aef1fe1fcc53758e5ac872c3d0d787eae14bbbd76670e9679223f6396
-EBUILD zathura-pdf-poppler-0.2.8.ebuild 859 BLAKE2B 39684772f5ef3b03275019594f4991c76c1aebf76ac1e48f5e540406497bb9b29cd142e225b1b442cdf9f5b75dd34e6cd23d5b612c73a4dd6945aa4a0c2f2ac9 SHA512 c5f26fba2fa2077b14a53bb7e1d46ab8c228cce3f0d06676b673d4a09acac7dee77e524eeaf7b63c6a3882290c9a906d5aab4c8a199dc294acc91ccd7d65ef66
+EBUILD zathura-pdf-poppler-0.2.8.ebuild 858 BLAKE2B ba83d7d00563e03c080154f5e3c36964eb587dbd6bc6bf78bad02d5e7f0134e3c463dd793d6e864901c5b9569a773a4ec0d0b68bb5fd17db5b093980bf724126 SHA512 b751fbed29bae1a90d7be7e4346176c76266898abc5526a010a82e0c0c398898e138ea464fd2dac76316a470a8ac97344e2808dfc13021999a1d18225c435f05
 EBUILD zathura-pdf-poppler-9999.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
index 7ad3b3bea727..1ac980534872 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 1d66205b0bbc..c9a818132347 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
 DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
 EBUILD zathura-ps-0.2.4.ebuild 927 BLAKE2B 28da921678d723a5a7039f80458e38b81e156ee9f1d6c2e472c70b69a66ea247e0e15b29f5218011f7585fa37a066223a6d3fe819063d244252bedc5dc1abd28 SHA512 ba7fbe161e87d476ed6413c44bc63d72ffe1ad79b5f555e9b01db19e7a06a772809b842ccd9e83e1ae98eede115cf9bcd97af005151510d2f2758f186841c837
-EBUILD zathura-ps-0.2.5.ebuild 932 BLAKE2B 1323526a3d9fbacd60af911d3d4d12069bcf8da3f2bd9d231bcb12d529dd9734b709b454c464c5f9554414c9276daf4cc260d86863faeca1553e1da25c13856a SHA512 ff560eb37bfcd9ccc371929490124afd499bb418ee9f5372256b517ada51eebde958d270d0875d078474d8b53619f8fe40b00d837197060cf6636cd7924b4eec
+EBUILD zathura-ps-0.2.5.ebuild 931 BLAKE2B da60bdb706487c8e464285a963722cdcac0d979913b65ede2aa1d7d0bb3cfde63927f84aa729bff86f8a8380e245360689c6df6a6219d93fe4c224b7162ce41f SHA512 64e3ca1aead820f3c49c4d65d06b5f7ba3a39f44f0585efcf5daa4a7d4aea01bd59735e6f0132688cd0c5246d41c7feebd9d76c083255a2b5048aa616231f1c1
 EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
index 0b688fc4614e..bd1db8d44519 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 90bdc0538168..489a8b11ab5d 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,6 +2,6 @@ AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b86
 DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
 DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
 EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
-EBUILD zathura-0.3.8.ebuild 1415 BLAKE2B 6972a811ea161d0004e89abafb330cb75ee900e02d4420ca0b31cd048f6ad9982676d1d1fe757c35dbbed2ef3c65b6e3a2090fd87278d0a060b909f97512ad54 SHA512 4779dfe9077ac2aa51815fb99026a88a877a5e3333732cfbbe07f8d926c6cfdd9c5fbc5f45854559308db56869c7e53e65a5f10b706b626d936315f14b3f16f3
+EBUILD zathura-0.3.8.ebuild 1414 BLAKE2B f84bbb42bf21f125cf80f0b6304917002d956fcc46a5c14ba02ad8ac9baf7124a97e25b0e492b77a9724d9a6aa06a0d8a1538b2adb3913c82377722eb39dab0d SHA512 f32f5c67abc780518c4355642a40c8e5c0d4690223bee60efaa5988846b452b9fbb872331c38267825218ebc7160c1767c403b9f62cc3f12a17820c11c1062d5
 EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
index ea705b8b5a89..3bbbd76e6463 100644
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
 fi