Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

24 files changed, 181 insertions, 35 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 04ebb3a65cc6..8a2152b1402a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index d4fb74782b66..1963ba8f6a00 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,5 @@
-DIST kbibtex-0.7.95.tar.xz 4060200 BLAKE2B aa08cd10c4e67bd8cdfc52803df03326a3c49b86aff699d7be2c40082f5d7359ef8aeb399dd3ab7c6b62f63274ad5d545c6acdaf4f77ed2b922583346557e76a SHA512 683456504861271df46d4b423ed8994f7e97d653e3b634c81c14b0187efa51ebae6d72bc4ccbe7cf18682ccfd9ff2cfcc2ba399a1d7f6bac62e3cb9e79710cd6
+DIST kbibtex-0.7.90.tar.xz 4059532 BLAKE2B 790cda2885e300c2f1701e1dccebce463275c439215a680c45954dc243d22b11168359c8d3dbb60a77e64d328ca62d6e11855b6cb1e44673e8173ba2a1b1d3b9 SHA512 d3aedff22f043608b99642c4332330d6472ea7cf960100ae0cdb2255e71702d1609333fee66918d5b276fdf3978cdbf91ef42512d7339b2245deb02e3c7279e2
 DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
 EBUILD kbibtex-0.8_pre20171110-r1.ebuild 2023 BLAKE2B 034890e5745e0d58442f985ad50a6abb543cb83a3f18f77d18110bc9e83b0b893e3d2937836bc4d0437114ea343bde2e78325c4a6c250a33708b14e56ed67901 SHA512 11b1445ecde7738e4f8a1818b8c7772d460c08dbbf9b8925c6f2eba095e54b9b53bd075cb5a3c0b616d6bba74194bfe4c225dff8ebe530bcc3dd855762666de0
-EBUILD kbibtex-0.8_pre20180526-r1.ebuild 1991 BLAKE2B 22fc9408993aa7c551b1eb9b9b02932c89a226650791a91db1af54238380e63582ce8cbdf7c610383023be26a4d362f1e81a42292d4926aafd386a7a4a4e4209 SHA512 7af2687fb97565c478bb38f1fdde5efdac067fcf360c3d356b63ba171dadfb955e1dd02a8e6d0375468caaf3073570d4537d9232a110d41cd297b72382f23719
+EBUILD kbibtex-0.8_pre20180526.ebuild 1991 BLAKE2B 7bc8c040b94a91dd6a2e78c4532f6693973449756e38ab7df9d82a23df35fefaa4abbe678a2bf0fe41625da6aeffdade9f2a31d4a1b6f72963b8c07ad08513c1 SHA512 b63afbee425a08e29bc343dcd244502da0c5e0e4030e96036945ec60fa236fe41071efa53414e1ace9a023b84fb5a6a896150374194f1bc58eb2d1c9782472cd
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild
index e581fd7cf61f..d5566c47efc8 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-MY_PV=0.7.95
+MY_PV=0.7.90
 KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index d0e8fa52bd3c..d7884301bb99 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,3 +1,8 @@
+AUX libabw-0.1.1-boost-1.59.patch 1077 BLAKE2B d7c9883639c9148ac5a1c4faf06d6f5cc15eb0f03a45f7a7e416ac080a8051b01858c13795cb4249c1952375ad5f11f4c9507a3a26bf00e799f71305933902d7 SHA512 436c8a855a8cdac0eeb24d7e6b7d7aeb2ca804402b6a70f793b654c2ff0d830a1b769db489f5c6f3650c5b65ea5cb8c62f4875b565f3f6cb9824b8f7d11e28da
+AUX libabw-0.1.1-dereference-before-null-check.patch 989 BLAKE2B 92276e79e393805847d570dfec195b8d4dbeeb6f106f4d46f31bd801f927e8ea0e481e8e40ab72861900a7282f0a57e3733bf3d491ff47451784b476025634f1 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694
+AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 BLAKE2B 9e368b07ddd2ec2a983a94a55344aa2c7e0560f435e589c609fa0cc9837cda14c433b50c20be11309dd95d5851a0d5053ffe19c353982821843ccbd29cfdd3e9 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242
+DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
-EBUILD libabw-0.1.2.ebuild 851 BLAKE2B fd94404dcfcdc39a0427bd7e79b5bf2fb97e7bb3e784b38077ad6293cffaebf1c7f16d1f87a2a2c9f6e0300ff4bc12e00d98d6ef80e301d4797427375935bda0 SHA512 4b12c64971db94eb5bb43d7f55e84e4b1c250beeb0bf2da92baf43f81843ad58dd4eeac3d7d292f88c6c0f7ddf3c86296cd24f6c04bbe3c15badc04261d25bc2
+EBUILD libabw-0.1.1.ebuild 1058 BLAKE2B ceee966d4dd894802d115d3c7ae7c2bc40c2c2656666c274005c056fcfd932ff03422dd6da0874a9ed6eb6d0174fc9b0dbd53f38fb9c0db58639b487608c6338 SHA512 3fefdbbd95e93c934c634798f0dc6a00eacee90f0fc53967d3a3b1685cdd49f37787c903192b9e0ede7e160e5fe9fe70183107c0a6a114e970b92fd79b7c95d8
+EBUILD libabw-0.1.2.ebuild 852 BLAKE2B 94986c5e7647b8a7950d4a3f585b061dba492ac1009d59bfce03e8e5dd5fab09bce7a86c738ac1924a85db88675655aaba5b2fae1e888bdb9a777408edc1d937 SHA512 d31164f1070df9c60e38dbc06b87786d4fe94a5913b3aed776d007fc899633d48bcef3a9df97ce7355d3183d077c768464aed74adf0769b34f222c16c55c0849
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
new file mode 100644
index 000000000000..f2e745a44d20
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
@@ -0,0 +1,22 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200)
+Subject: fix build with boost 1.59
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479
+
+fix build with boost 1.59
+
+Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23
+---
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5766f39..d12d8e2 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -26,6 +26,7 @@ generated_files = \
+ 	$(top_builddir)/src/lib/tokens.h \
+ 	$(top_builddir)/src/lib/tokenhash.h
+ 
++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
new file mode 100644
index 000000000000..1df274afbe8f
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
@@ -0,0 +1,27 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
+Subject: coverity#1259904 dereference before null check
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
+
+coverity#1259904 dereference before null check
+
+Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
+---
+
+diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
+index cf914bf..426ab54 100644
+--- a/src/lib/ABWParser.cpp
++++ b/src/lib/ABWParser.cpp
+@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader)
+ void libabw::ABWParser::readM(xmlTextReaderPtr reader)
+ {
+   xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
+-  m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+   if (key)
++  {
++    m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+     xmlFree(key);
++  }
+ }
+ 
+ void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
diff --git a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
new file mode 100644
index 000000000000..4854072bc8a0
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
@@ -0,0 +1,35 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
+Subject: coverity#1259905 do not let AbiDocument::parse throw
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
+
+coverity#1259905 do not let AbiDocument::parse throw
+
+This also fixes coverity#1259906 and coverity#1259907 .
+
+Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
+---
+
+diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
+index b8ab661..23ff750 100644
+--- a/src/lib/AbiDocument.cpp
++++ b/src/lib/AbiDocument.cpp
+@@ -110,7 +110,7 @@ is not protected
+ \return A value that indicates whether the conversion was successful and in case it
+ was not, it indicates the reason of the error
+ */
+-ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface)
++ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try
+ {
+   ABW_DEBUG_MSG(("AbiDocument::parse\n"));
+   if (!input)
+@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
+     return true;
+   return false;
+ }
++catch (...)
++{
++  return false;
++}
++
+ /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
new file mode 100644
index 000000000000..a1015d7310f3
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	# from git master
+	"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
+	"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
+	"${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 619470
+	append-cxxflags -std=c++14
+
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index 9bc7f96f1b3a..93e138cf1a8e 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index c0ea49729dae..c53294713ae8 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
-EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
+EBUILD libepubgen-0.1.0.ebuild 726 BLAKE2B bb60b228faf6ff717939b896ef178ef3d8c67e539f464b14ea865e3ae534a0059d692d3234f05944e102fe225d2374e5d196357225e1d396149c145859b534b9 SHA512 4aff30cda11433fd675f975ea99a95f9c76380b6d6ddee4f1391d53740cd9101a8275e3cc48dfd1fd6d3808110e18dbbe8d322158ddcdcfba912422bb8b6d8ad
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.0.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
index 300033a02b9b..d6ff7af29cad 100644
--- a/app-text/libepubgen/libepubgen-0.1.0.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index aae84f9f8352..a267933e8b27 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
 EBUILD libmspub-0.1.2.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
-EBUILD libmspub-0.1.4.ebuild 1169 BLAKE2B cd68cd7f1b6b51358e78f59b7af38a3da8e9a04c4008e39209bda33f6be03b3cd34fc6ba341277c7434ab4cf99d12ed1b3a29e01a68fbb6d8ff4274e34be11d8 SHA512 51d391abb02111bd9628f8abf9f63171e09f7eea345774989c0e214ebde21f0335870371cbe9a6badf3b72bbdd489d5c7726ab5dbe24c311d60c80978277c37e
+EBUILD libmspub-0.1.4.ebuild 1170 BLAKE2B bdccdac1722a3e33441eb452b7e4a7c92d058e04190cedbc3676fc8e8dc756ad76734841611d89bee5a0fe33069454316d95f1303a3da1f6c55c20f6ebdb4b3e SHA512 61f95c0a605fd50cba557dce4ae248d3043f7ccda1a55097e75a72b7468b4cdddfdbae0cae8a11df10a5884686ee328af5282d4c8ab9bccb47a0f7e907268ed3
 EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index a7a301490ef3..358bec7b7081 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 548f2330a6b6..6ee50fb134bc 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,3 @@
-DIST libnumbertext-1.0_beta3.tar.gz 415089 BLAKE2B 2e0e493f9553b363418c9a0003fef8ac20f28d4beebebcfb1beceddc693010dbeeafbfa4f1887feda2861f17a8397a78f8a836d8b87c0af96e1fad2ef3e77d10 SHA512 7afe747a243933c42d4e2c4b9de0d2a2d98bf990decd0f5a6b31b7ffca4a0a76c1d4f657612e50dabe07a1355331595c997e1cdd561760efba5b62779e1adfa1
-EBUILD libnumbertext-1.0_beta3.ebuild 637 BLAKE2B 1b6335304c3bc914c1812b309d08dab76b5bb26bd10417e75a998ab4001d4fad2d2e90c64bbb0e57783de67828a5643d75660f28d85e74157ae563350add01e4 SHA512 90cc918f849f81c0488fcca9adcccfc3c5e9a1b5d4d26cc2462b5b1011043320c1b31f1651579c737b8e2051106a29328b3343225e73dfbf5bc4574b995e46de
+DIST libnumbertext-1.0_beta2.tar.gz 407135 BLAKE2B 6fecc6c885fbd9a2a701e5d3c10d38205e2d66a9e1e26609da8dd3ae92d2a954528ba011e7442fee0f4ffb3035ebe9381076a3eaac368e15a98a02508828997c SHA512 0db0e800495507b6173a134b1d2e681c326df56fc6fdaf5ae9e69e9f10ccfde1ad13b2150fb6120d15bd401c348a58570cbcad1b0be01fd80e24b67a67fd236a
+EBUILD libnumbertext-1.0_beta2.ebuild 637 BLAKE2B 1b6335304c3bc914c1812b309d08dab76b5bb26bd10417e75a998ab4001d4fad2d2e90c64bbb0e57783de67828a5643d75660f28d85e74157ae563350add01e4 SHA512 90cc918f849f81c0488fcca9adcccfc3c5e9a1b5d4d26cc2462b5b1011043320c1b31f1651579c737b8e2051106a29328b3343225e73dfbf5bc4574b995e46de
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0_beta3.ebuild b/app-text/libnumbertext/libnumbertext-1.0_beta2.ebuild
index 9145fa33adb8..9145fa33adb8 100644
--- a/app-text/libnumbertext/libnumbertext-1.0_beta3.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0_beta2.ebuild
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 1d8d8d9769e6..bc19c1967ec2 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
-EBUILD libqxp-0.0.1.ebuild 732 BLAKE2B 2d925322161bd3762152d89d3502fbc81b4634fb8ea3df1509728ed483e61d4b9a1f7603f690a131f2b907ae38c2e8534f41a6182deb1ad6fe64e782e822e1e4 SHA512 4bfafacd9383f0f666c0f3f6959bb9e319d32a6eaf74e0d4629abf8de482da52a877ab0f213dab8182e31e94fe4bbeb5f01de0f7359574b80ec2195c340fe155
+EBUILD libqxp-0.0.1.ebuild 733 BLAKE2B 500a3976587919cdc6e658b5212ae4e3a99b0febe1ee7b349d77ec6ba82d62434605eb0850436727fcffa17d0b70ec27e89054b163f1985c504a2cb746b880e3 SHA512 47e159553f3ca54c2c002e88fa1f76aa016ecd04e846b7a149d33fb45dcfe3d66aebc03f111a4e6bc6a9eaeec5619eb397097030deb2d5defc2192ae9602d9b8
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index 709bbbbb8ce5..d0769c66950d 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 2b49cecfac06..d6581decb962 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,6 +3,6 @@ AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1667 BLAKE2B 7fde7a6da18f666a3711a13235b118c0f9e4962acfcbfd130dec412af8610eab9c6350378dbd6bac32c45c0d133761be4b08ae171b0d96a253cd0fa0b55d2583 SHA512 73b11ba7aa86643856d0b2cef8ddcae846108bbd38ab59e3eb779b7846b7afd5552370a653965f1d25ca32d97ba6461b37ece56b4d92b4c45e97fd6b5d6879b4
-EBUILD recode-3.7_pre20140303.ebuild 1114 BLAKE2B 04c89e3e73d3cf4cd961d4e024d0e141898bd037402d563871981afb2536bdde7faff2cbe32895f145131c47c750faa741b39d8b67a1eaa653ff1513580a067f SHA512 24e1156be1209ccd38cda16c665007203afb5effe7934652d48832afcbe8319aeb88bd337cded810fe2650c38ae20468fce23983ddbe5ca50e565af51265668c
+EBUILD recode-3.6_p20-r1.ebuild 1665 BLAKE2B bd4d92c3bb4793a62ddb74f64861a199929c4e367158ebab9185179d9810966c11b3dd2cb9819e02282070625d0cb66b2b44f868ef4ab229fc6fccdf6e9de52d SHA512 deb02a301a74b69c41c2ce8e7e6f4915bbfab252351b967a6f50aca472b6d0b839bc766f8e46a8f1ba591c5e294d5c985a59e34f975300f9eaf859bfa681d0ae
+EBUILD recode-3.7_pre20140303.ebuild 1112 BLAKE2B 32084db0a239e7cc886c7a829db0464769614c77cca31322d1f5fbc3bf444ea3186461895fe8ddc8d1d08524c75aef9494c6e4e8706f74cefd4aab8b27fde90b SHA512 f402ca775006bfef301b63759204a47bf46719b954912fe0235bd47b24998a13fc8cbb167277eb3aa51e60038ad59a08a29e3e4b82098cf13a587b31c1e79c35
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 9444428a270b..c65c85ddd67f 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ MY_PV=${PV%_*}
 DEB_PATCH=${PV#*p}
 
 DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
+HOMEPAGE="http://recode.progiciels-bpi.ca/"
 SRC_URI="
 	mirror://gnu/${PN}/${MY_P}.tar.gz
 	mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz"
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index a6c2e5b129fe..7ec8284a8d04 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic libtool toolchain-funcs
 
 DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
+HOMEPAGE="http://recode.progiciels-bpi.ca/"
 REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
 SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
 
diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
index feda57cc18f4..17b9c2019807 100644
--- a/app-text/tokyodystopia/Manifest
+++ b/app-text/tokyodystopia/Manifest
@@ -2,5 +2,5 @@ AUX fix_ldconfig.patch 439 BLAKE2B fa9c4b1cf06b2ea8e0a2ff6546e09040e92718558e824
 AUX fix_rpath.patch 2631 BLAKE2B abc4903f98c2399f9514322cc93e9ead3452f09fd5fc88f8ac096613ed676eec517f9eb3fd3412f438a047e9c0305535589bb8ef263f55721dc02c503cfeb87f SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1
 AUX remove_docinst.patch 456 BLAKE2B 768890c4f85a391eac2e436db6b457042a8bf6b28c1c370d19be67a85c194b5a4be06b1f5f1541ad0552228145c7e44587c9c39fa553a5866d8886220e8d2847 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29
 DIST tokyodystopia-0.9.15.tar.gz 158522 BLAKE2B 624efe5ab587b8fcb63c6365862851ec8f3e596a9d75b48a273e008fadc0919004c6163ca54600b741289ed9f16f9e6d003766a4562f3df6214d48e3ff647ada SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd
-EBUILD tokyodystopia-0.9.15.ebuild 719 BLAKE2B a2aa45d98aff6d418ec949d1aa1b3802537a01db7bd29a0f6ca253420c5d7bc9ce62383294629d7376c843fc41a521b7f7cbe0f36447e58a28979d48fb7bf518 SHA512 ac94b786b140e5c682aec0ca1ef7dbd465372cc449242138a8573638ee7431d3d60f0a1e081bfb8f6296206723db9d4e43b85eaf50e172696e1e0fc4abf0b270
+EBUILD tokyodystopia-0.9.15.ebuild 851 BLAKE2B 037e2e22b7982a3516ce4abc7e4797e81deb6363faeb0d38a6a74d7667849bfd22782bfb8c6395260ed7eca91a9b40fa70238b1c7198575f17911cdc30a8e791 SHA512 23d0384098c12352f79db79c0835be29d91fa988a370c357f2d7920a3acefc06967f0dee5f094fa8449626b069fee976b23206a48a7f96971e7728ff49a18aec
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 853fc3b700e1..9a0508821fb2 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="2"
+
+inherit eutils
 
 DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
 HOMEPAGE="http://fallabs.com/tokyodystopia/"
@@ -15,27 +17,28 @@ IUSE="examples"
 DEPEND="dev-db/tokyocabinet"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/fix_rpath.patch"
-	"${FILESDIR}/fix_ldconfig.patch"
-	"${FILESDIR}/remove_docinst.patch"
-)
+src_prepare() {
+	epatch "${FILESDIR}/fix_rpath.patch"
+	epatch "${FILESDIR}/fix_ldconfig.patch"
+	epatch "${FILESDIR}/remove_docinst.patch"
+}
 
 src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/libexec/${PN}
+	econf --libexecdir=/usr/libexec/${PN} || die
 }
 
 src_install() {
-	HTML_DOCS=( doc/. )
+	emake DESTDIR="${D}" install || die "Install failed"
 
-	default
+	dohtml doc/* || die
 
 	if use examples; then
 		insinto /usr/share/${PF}/example
-		doins example/.
+		doins example/* || die "Install failed"
 	fi
+
 }
 
 src_test() {
-	emake -j1 check
+	emake -j1 check || die "Tests failed"
 }
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 57be557ec0e3..35eec86990a1 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
-EBUILD yelp-tools-3.18.0.ebuild 677 BLAKE2B fd7675927525ae1e757335865eec743ff7491a35df9488552aba88466dfb6a0d4c8cf0b48bb8a649d6b00876e2d95c08a8b83ba3db79b98457d4ccb8e3db6aa9 SHA512 74f1b77433bb14b613ad37014b24de0106f1ce32c3d5f6cf1a025b66ca6a14cb2fa9821cc77e12a2f1c8cc04d38ba5a949b722c042be707ba098077e3816b8c2
+EBUILD yelp-tools-3.18.0.ebuild 678 BLAKE2B 1db8a48e76040524cdb5bc05b70d65ec1a58a46dee39f0a3e7d9b29d81805fc79a6e941c6decf3363237212f5271d142071f3c47dfd2dc0019597c402a237278 SHA512 3ffe79f0f4a2a757a941061b7c9c7df2f4fd311845112c890d928a5aa20f66588ba2f418dc1439b35ea54727976bddcd36019807f80d9d41ff0cdb750c8b9449
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
index d69aa378bec6..c1a7c1f07b3c 100644
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="