gentoo resync : 15.09.2018

22 files changed, 96 insertions, 182 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 35f3fdcc145d..f8159698c261 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 7a8f585db2dd..098d3f70a14d 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -6,5 +6,5 @@ DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468
 EBUILD atril-1.12.2-r5.ebuild 2382 BLAKE2B ec25ced8e7a2cd8a016a610f25934f6a7d3d51331837b9080698290a2a5d1efcc121c5bc4b5c250e497e6c445801ad83b8acfdadf05b0446bc46745a7682c9da SHA512 c5ba364d84fc7eaca092b67abeba1ba7b1fba69c2eba9b25c222d2bd90eb340e45013186ff7d1049fc80d0b073ed17cc7a28a019112cbdb82b5eaade6f2281eb
 EBUILD atril-1.14.2-r2.ebuild 2424 BLAKE2B 08574d5d036b9d82b488eb2eb22b51c45589966b66a1ea098ddbe6549f9aff4502b54e9fa16ed286409ba36a7d06a7db5c5bdce3a6cafb2f309e59dd1cd1eda5 SHA512 08a36e6834962d26061983ec642e1ef6b2ed5ef6b2acf581d760cd3bc7d4ef1b77e6b04242c030bf5c0431b48abaad0ae252f41996d1bbe6c418354bbdf545bd
 EBUILD atril-1.16.1-r2.ebuild 2361 BLAKE2B 976f440938df2ccbc05556b1ff48113467c6e37cd9ffe807b5c57d63bf9fe89de764862516856a08b040667fdbb1239961bea0cc343644e283919846e915d171 SHA512 b12c4cd1992f30ce6a33df8e0bb063afa3ebdc292ff9226fa63adae17642beb1a7f7ce1437238c745c0faab79d0b761d29251df4a022c68854d39962c321df0c
-EBUILD atril-1.18.3.ebuild 2166 BLAKE2B 317b5a70b879cef4660947239602677c1667140775381b94e16b76074cd675cd29e7f4af3ecd3521083f3d3163fd18dddac3863275b1252e8983d5d82ba29e27 SHA512 6c49d6f01717382a81807ad5b2bbb5c56a0b162492166c3a781051efaeb6ee1205fa448daaddc6ac71744d65c95d25e143ee972c177883c3fef39fdfa54dcee9
+EBUILD atril-1.18.3.ebuild 2164 BLAKE2B b846318383a8a5c62e7c48807172df259df46254d95eb64d962884c26decad08bf5023b6c07bf64c23a29ca534421daed0c2951d41b96f828a9ccd78e088974a SHA512 6c9782e6bd88b3258a54cbd4f31115f6527fd91a745c587ca872f9956afc6cb752b651aab86c18b563f935e469873efe780dc5965c6c6d3f2001cb3ca72a1a97
 MISC metadata.xml 843 BLAKE2B 85c02a872255c9b51727285c86f1f5df7c8b841576557ba7bbc240cc3e549ddf1f681e1c9f416785650d7d9e3168e4db06ca52ce61e50a47fe6660a73e97dc92 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc
diff --git a/app-text/atril/atril-1.18.3.ebuild b/app-text/atril/atril-1.18.3.ebuild
index e4db37226f49..642717fb10c7 100644
--- a/app-text/atril/atril-1.18.3.ebuild
+++ b/app-text/atril/atril-1.18.3.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
index f335556d64f5..76f4f6a00546 100644
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@@ -1,3 +1,3 @@
 DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
-EBUILD capyt-1.1.1.ebuild 621 BLAKE2B 1a515438c4edffcfe46c918a72269eee288be9a2b79462407f167006623d88a0e85b35a5a27faf78c85aa9dbf7d90eb39268f11a0d73f6849668743cf877315c SHA512 8a140ac9876c903b14f0d6649f5f520abed1fcdae3816c75b7c0980c3770f1046d6b623d0575a267fc9b39dc7608b5b9441fa84b89cbec70cb40b42b46d59952
+EBUILD capyt-1.1.1.ebuild 619 BLAKE2B 39f761d1aaea36e271dc9dcb532c05a66012daff02f7bcff75b063813ce5e3fd0ba8e85ba2487a8602685e3542ef1c1fa32cd333fcd1709ac3028b37fa53cf2a SHA512 28d490b8e6e6ae460f65efb9e33dc00923607d91a346e668851728a63e7a6ccaae51b22a3a95a9ccc96c30052c5a24dfa3ee0067226695874ef2bb583d6f348f
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1.ebuild
index 3ecc5167169f..5292845b844f 100644
--- a/app-text/capyt/capyt-1.1.1.ebuild
+++ b/app-text/capyt/capyt-1.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/lbatalha/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 9e5c79bef8e3..d8d1291acc4f 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,5 +1,3 @@
-DIST cb2bib-1.9.7.tar.gz 845121 BLAKE2B eafce83874e82c20a45de5dc4c1558aa40346821f26bf2d9f53332f337e5cdaffb92c70972fd8b99823f72615608ea848808c9875e16ed50f02cf1d9655d552e SHA512 87a438288c6e7776db136de63de1a8e27f2abf8499d28c0691b60ad3ef4f848e8987af4fc47d1f2cfb1d47009e28e7535f6bab998811cb721bfc9f384941b1e4
 DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
-EBUILD cb2bib-1.9.7.ebuild 1790 BLAKE2B db2460c6938e26d0d349b6bf4ec5e3c8cf70484a9f88cd6774b1586ab1b16a847cae12dcc1aa0befaef92b45261136247b4b0eaa28c1502110f16958c49bd320 SHA512 32a00cff24547b539671f355083d5b8956d49a1ad416ad904c94f2c72b4ad2c1376298e6aaf1515a995f771cb9b6a2989c06a80ed408c24982b94dbc72109d7b
-EBUILD cb2bib-1.9.8.ebuild 1780 BLAKE2B 3d8ed83b34ac231bb158646f6ef3d45200e784f9702fc328ed5fd77c4f870f099856264f1d22fec812ae1dc27efad82a14002ca623dbd88fa1383f9502aff9f5 SHA512 7001951bf5a033a735d7b5a60c45d5c775bbcfb974fffac8a543ec95a2edaeaf1cd54a2053bd262515db81f65bf9334e906a06430a1715a63d81d3bc850c22b3
+EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.7.ebuild b/app-text/cb2bib/cb2bib-1.9.7.ebuild
deleted file mode 100644
index ee41902c48f2..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="http://www.molspaces.com/cb2bib/"
-SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	lzo? ( dev-libs/lzo:2 )
-	webkit? ( dev-qt/qtwebkit:5 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
-	default
-
-	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
-	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
-	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		$(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	einfo
-	elog "For best functionality, emerge the following packages:"
-	elog "    app-text/poppler[utils] - for data import from PDF files"
-	elog "    app-text/dvipdfm        - for data import from DVI files"
-	elog "    app-text/bibutils       - for data import from ISI, endnote format"
-	elog "    media-fonts/jsmath      - for displaying mathematical notation"
-	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
-	elog "                              text strings"
-	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
-	elog "                              nice printing through the shell script bib2pdf"
-	einfo
-}
diff --git a/app-text/cb2bib/cb2bib-1.9.8.ebuild b/app-text/cb2bib/cb2bib-1.9.8.ebuild
index 295b6e26046f..e91077411de8 100644
--- a/app-text/cb2bib/cb2bib-1.9.8.ebuild
+++ b/app-text/cb2bib/cb2bib-1.9.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lzo webengine +webkit"
 
 REQUIRED_USE="?? ( webkit webengine )"
diff --git a/app-text/cutemarked/Manifest b/app-text/cutemarked/Manifest
index 910bc18ed645..77f5a33899c4 100644
--- a/app-text/cutemarked/Manifest
+++ b/app-text/cutemarked/Manifest
@@ -1,4 +1,6 @@
 AUX cutemarked-0.11.1-respect-destdir.patch 992 BLAKE2B 17c10668ead3f212a6038d83881faaa09b9e4de0bc6e835236e21eda97581129ced3d3d607147729c942db243e8072c04cf9314cf4b40ebf6a84a812e9ad1dbf SHA512 dc6c48c7c0b9b4684b333d1f1aa000d95422b1cac4e71f16cb84eb8bcede63fcc653528005af17fb6757475c9c05c50bffe859d64d5c568e831de7e7769fc92d
+AUX cutemarked-0.11.3-bgcolor.patch 315 BLAKE2B fa5bcae83522c24d62214eb10852cc991eadefb2fc125bcfb4bca5372e0a766476db8b6adf9cfbe6d9fe9660547233628853cbaabbf0a9bf36d9524f4b1481cc SHA512 f7d1975436dd27b97204fd772a5d210ea1f25e85c3da60b066923e21087eae5d1dcc2db94dfde50705d19a85bbf4667da8b94c4e7284686f9a03876e7807a98a
+AUX cutemarked-0.11.3-qaction-include.patch 367 BLAKE2B dd6686f855ed4e1229d5d0692d7aef167b04fd36aea21e73d5ce5d3ef57731149b19ed33b58e84a1e12fdba3219f62a871b5d807f8cd05daa49c93c7ad438402 SHA512 27b95703c340950b6789266b43c7b5752c56e2d7c45ff86f377f57d39cc56664d266046a06b63411afb23858de318d9c7a2c21c0614ab1713c3953af467acba5
 DIST cutemarked-0.11.3.tar.gz 772238 BLAKE2B 1acc7291d968f26f87a1b2fc1070ca3a61053b8bba04c57d91917ed3dea6a5893b9cab41004cef044ddb656e3d334d177d6765db7624d33f91f749d5787b23b2 SHA512 3b776f6453812ce4afa37532bf03adce01ad3ec2fb0d848e3a0e5f18ca30be6f1e9f6b3c815917a96c9637c722d53a5bc249d5f58b209000d7d794239626ca30
-EBUILD cutemarked-0.11.3.ebuild 730 BLAKE2B e00d9dd67ef4c3b9f19ec502c5f1fdac6efc476136bacdc26851a15ba6bd86f0239ba5b1d8f1e3b1628684da33b68d7501b8e83d6b233272604b4a4c4f7b4214 SHA512 b19d529d6b924a038375c8a4dc9a881fc865fd85b33cbf64b0035fe729d48b68a01e01c1738251b2fe6a1a2d903b71e1af0c161d144557c0c080f6224b517e7d
+EBUILD cutemarked-0.11.3-r1.ebuild 809 BLAKE2B 0f879ae1920bf640f7c7c80c3db54cf437d26236e04bcedb13d5a352b66bcf10185f4fe2ecf3cc60fc40fc6d26632d04b39d413ded37964b7e7cd24c1ecd7537 SHA512 7f6cf97a9f8e19ef8667f32bd7e0bf8e4e69aa6469d7a55a6e65c837f97b6a207772f58430ee116ee530247a7259a5400dca2cbe1226dc21c4c391caf16e3590
 MISC metadata.xml 342 BLAKE2B e03fde7a5232c8c6c2134ee0f9441d6f72440d942025655d5ee2c74f7069416057b315bbc5b3f9e468507ec1324f9d9f6abc4598e01590c7dae1efdbbbcfc56c SHA512 4568bb1fe2212d4dcde357798fb5e0c3ab4155e5ff388e6fd545a8a2c2ffad023eefc2e874bebd7005cee77266ee034f11dddf8f260cab0be396094db9e2f39a
diff --git a/app-text/cutemarked/cutemarked-0.11.3.ebuild b/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
index a6afe6931aeb..d4f1373747d4 100644
--- a/app-text/cutemarked/cutemarked-0.11.3.ebuild
+++ b/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit qmake-utils
 
@@ -15,23 +15,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
+	app-text/discount
+	app-text/hunspell
+	dev-qt/linguist-tools:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/linguist-tools:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qttest:5
-	app-text/discount
-	app-text/hunspell
+	dev-qt/qtwebkit:5
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/CuteMarkEd-${PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
-}
+PATCHES=(
+	"${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
+	"${FILESDIR}/${PN}"-0.11.3-qaction-include.patch
+	"${FILESDIR}/${PN}"-0.11.3-bgcolor.patch
+)
 
 src_configure() {
 	eqmake5 ROOT="${D}" CuteMarkEd.pro
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch b/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
new file mode 100644
index 000000000000..8cf1fe5f1c30
--- /dev/null
+++ b/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
@@ -0,0 +1,12 @@
+diff --git a/app/styles/markdown.css b/app/styles/markdown.css
+index 7c87385..607f025 100644
+--- a/app/styles/markdown.css
++++ b/app/styles/markdown.css
+@@ -25,6 +25,7 @@ body{
+     line-height: 1;
+     max-width: 960px;
+     padding: 30px;
++    background-color: #ffffff;
+ }
+ h1, h2, h3, h4 {
+     color: #111111;
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch b/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
new file mode 100644
index 000000000000..5e585945902c
--- /dev/null
+++ b/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
@@ -0,0 +1,11 @@
+diff -Nru a/app/optionsdialog.cpp b/app/optionsdialog.cpp
+--- a/app/optionsdialog.cpp	2016-03-28 13:48:50.000000000 +0200
++++ b/app/optionsdialog.cpp	2018-06-05 07:28:09.086517828 +0200
+@@ -17,6 +17,7 @@
+ #include "optionsdialog.h"
+ #include "ui_optionsdialog.h"
+ 
++#include <QAction>
+ #include <QFontComboBox>
+ #include <QItemEditorFactory>
+ #include <QKeySequence>
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 0595e5b636ea..9a1398278489 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -6,6 +6,7 @@ DIST dvisvgm-2.3.5.tar.gz 2897194 BLAKE2B 7661d6f5ac097a6dc62cf873dee84ec47b55e4
 DIST dvisvgm-2.4.2.tar.gz 2918538 BLAKE2B 373e2e6a017189dc130cc40f9abfd4601a1764400858860104e764757e93758a7d12c6b8125d684ba7a9d4bb21fe2820007852ea2e46f57cd3fe7d61d2a4d63b SHA512 9c2dbf088244898ce86a177d81cbf67bbae2df8703dce686016e2b455f6eea516751e84521f8097b82bd6a9e5b294043e3ee38cd470ff6ac1633a976828b99fc
 DIST dvisvgm-2.4.tar.gz 2850942 BLAKE2B c1cdb4aed954bcb5704b83deba087403f366f0139b053b599029d103bd85306e58c7bffb1228d3ace02fd3be91eff002e6d1e45105bb8ccaa85945ba7bbf5210 SHA512 84f51fa8cbf0a32efe667321102b1705c613cc697d86d00df2e044cd97b1f390e1552af7da2891792ccef634507bbc6922f92f194f5acb7d05a48e268e708396
 DIST dvisvgm-2.5.tar.gz 2911331 BLAKE2B b9ee90f5e34784d690f6a9a80dd1cdc4ce516f1e50722a93a0ea6e03da4f60f1bb983fa8abd8e670b2719afbf3197e6483a5c401fa1d668f79569d6a21701be2 SHA512 a722abb94c93ed8f7a6a91730639b7471b37c8c215297efe2ee071ff31829911c49253f17ccbb01dcea578ff55f2b179d85a0d9d32f65ed34ab18455e844578e
+DIST dvisvgm-2.6.tar.gz 2978741 BLAKE2B 342da9c26d05cf319053206d84e8c12ec3f3984b515f8fa6483a1ce5bf1748477f1119e8e03847a28c6458ba25229fd735a63122257450612fcc226a2e871441 SHA512 02fc3a92fe80d7146a1bc84eaa28fac714f533d9bcc3847993da978a66f533400c2c03019bb5efb3c16fcbf6774c565b1f6149cd15f4e04ae05304f879392b05
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1144 BLAKE2B 905c8dd91653845c82e4ab1065eb69961b5a3fb4d0e0cd61f0174f9185d5cc376ede38becab539a8a60182a1f94fcfa871b1598ce269144fe133ec23a498b9b9 SHA512 d6e0f9fba9b8636e126ebf30c7eca4c14a9e31cb3e5e7bbc220a2f49c91e293e5cdaf23321be066dd38204e8abfa06d45a08577a78da589b28f1fccaf8fd8bea
 EBUILD dvisvgm-2.3.3.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
@@ -13,5 +14,6 @@ EBUILD dvisvgm-2.3.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d0
 EBUILD dvisvgm-2.3.5.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.4.2.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.5.ebuild 1186 BLAKE2B a789f9cfcbffb73daa1782cf7df501783ce7ec98ac6d51b29d690d3d161f610799b847e4e9fd2c4340d1ccb041310b906e1e951ab025642aa01209011ec90581 SHA512 68cf41d70b133c474abd76242306053ae93f02f1d1ddf788d6d3f96289c9e68ee6d1d1e7d7b71f373bfbf9a6d5514e3e6656cc54965108154c339aa76cfe5795
+EBUILD dvisvgm-2.5.ebuild 1216 BLAKE2B 4e39f999bf7a1c234c9f5e0e6ec0a37518b3003406fa4c78ce237bb38340c706ae41d4c246d1e29662f6df6a3309b583dd11d4e2e6086ae35cf5f754ebe7dce9 SHA512 4f767d7594f0f2985c8c5be50981c6719ef8b01266dc95f8aebed2d355153890318015fa5a5f3f278603015bead0fb28f929bee0e2aa38ce41c2b90cc40d5063
+EBUILD dvisvgm-2.6.ebuild 1216 BLAKE2B 4e39f999bf7a1c234c9f5e0e6ec0a37518b3003406fa4c78ce237bb38340c706ae41d4c246d1e29662f6df6a3309b583dd11d4e2e6086ae35cf5f754ebe7dce9 SHA512 4f767d7594f0f2985c8c5be50981c6719ef8b01266dc95f8aebed2d355153890318015fa5a5f3f278603015bead0fb28f929bee0e2aa38ce41c2b90cc40d5063
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.5.ebuild b/app-text/dvisvgm/dvisvgm-2.5.ebuild
index f4c0ba5ab26e..aacbe77eab61 100644
--- a/app-text/dvisvgm/dvisvgm-2.5.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.6.ebuild b/app-text/dvisvgm/dvisvgm-2.6.ebuild
new file mode 100644
index 000000000000..aacbe77eab61
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	>=app-arch/brotli-1.0.5
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=dev-libs/xxhash-0.6.5
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	>=media-libs/woff2-1.0.2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index 651f16bb2428..f53afa5b47be 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
-EBUILD ebook-tools-0.2.2-r1.ebuild 664 BLAKE2B 69992871106265b158efc70104eb88307666359f5f6cf022a6556e0a53387b742e4284ceb2406759a4140a30e9b0210f4bfaa0ba31dd0e47b3086c8f01ed826c SHA512 01fb340e3630a8ca9fef435155866513c9b025ce80aebb39b0f21bac11153982ec07e18ec80366e3e54bccc0512a300b8a116decb0aacd43c85cc5abe61d1667
+EBUILD ebook-tools-0.2.2-r1.ebuild 665 BLAKE2B 86dde90fc9d8134a8f844ff95f090fc96a89cc7abe2ca0991c6678b19dc3c57293f93bfe5519d4dae8f233250191578d91fefe9caf02a1b9a57168a269130c29 SHA512 c6a835c5c14e7a9a5d97896bc693caf91c8269a55dfcf886c4a0f0ce54a83acabda39b164ba3f05287fbcdd081f29ba3907b7c18ea6b2705a0827e4bc09988ad
 MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
index 5c913b002dc0..548b754dde90 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Tools for accessing and converting various ebook file formats"
-HOMEPAGE="https://sourceforge.net/projects/ebook-tools"
+HOMEPAGE="https://sourceforge.net/projects/ebook-tools/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-text/htmlrecode/Manifest b/app-text/htmlrecode/Manifest
index 80d944afacbb..5b7a3ed5796a 100644
--- a/app-text/htmlrecode/Manifest
+++ b/app-text/htmlrecode/Manifest
@@ -1,5 +1,4 @@
 AUX htmlrecode-1.3.1-ar.patch 187 BLAKE2B 2931aec68270d9c9bd91c494eea1598915713eb5d80433e95f12a1fa4f432bc0238eb02f77361090ea8525aaab9027b753b62bb6b44109e4f83659de5efc8d10 SHA512 a49a858d317a8eaaf5ac5079763e04f043c5471519dd7f362ccb621ec43b13841c31a24436d255f5386982bd78ae6182ad7c5bf990e4c4164ec800ac616a9df8
 DIST htmlrecode-1.3.1.tar.bz2 51387 BLAKE2B 7aee0e5c6c5c3c599ccaff76c7bd2e36b63857e96429c582eeda5f16cce6c1ceeb1bff929c4ea03f8bb6ad0154b92a90e53132334c7e59f365e5541b87c65e97 SHA512 180b9c2a1214007bd3163d5df7bcf15c299f452b78f0383a01d85d48212d8ae32c2b5598f44c40ce54b332c26f3ee5c448c614fbae383ec9a326e44f69b0ad10
 EBUILD htmlrecode-1.3.1-r1.ebuild 774 BLAKE2B f3f4931263c7c6e64c6657b80082a9efbec307311974c4ae536d52791f622a8982ce1107b5b359c3666125adbb35d4c37979a4f404494774f774ad4ef1a087d5 SHA512 43618c5df87e122fdcecbf85c29c56b14c781e105a5fe54e2179aa553391845fdbecd5826ccef749892507c0b6792977387f66ebc7f514d8b3310ee79d650351
-EBUILD htmlrecode-1.3.1.ebuild 799 BLAKE2B 692d9396916f975c3e1640785c61a518dddcd90e1811024762000f94b22a92d8e565a2fa6b15b531b04f0acf1bf1bb462f15c9581127288a4f1ff16d31b97ee2 SHA512 5bac586cc6a9255fa8bcc18faa9f2cae07a8a1511b7cba695fb187f1196a92aed95021bab696edeec1501089bc1323be1785da6c61a732feaf6798b8652a867a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
deleted file mode 100644
index 1174c57d9c79..000000000000
--- a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Recodes HTML file using a new character set"
-HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
-SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ar.patch"
-	touch .depend argh/.depend
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local makeopts=(
-		AR="$(tc-getAR)"
-		CPPDEBUG=
-		CXX="$(tc-getCXX)"
-		CXXFLAGS="${CXXFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-	emake "${makeopts[@]}" -C argh libargh.a
-	emake "${makeopts[@]}" htmlrecode
-}
-
-src_install() {
-	dobin htmlrecode
-	dohtml README.html
-}
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 61c7b2c9e486..5a7675809d76 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,6 +1,5 @@
 AUX pep-2.8-gentoo.patch 494 BLAKE2B 62beadd57cf83f21f92dc9597265f7ef672aa19e743fd256dc30afe84d57accb741dfde47d1a87dc4b14242432fdcb08fa169db7cace74524458f4ed4b900239 SHA512 5c214a7d6d86ff59f2edf9e77d480414d7a2dbc0ce5f9a96012c6e642f6c0918772558f46c0c2c5e3f6898c7e751438859bae5bb89a900e64e33f1dd53f390e7
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
 DIST pep28.zip 83969 BLAKE2B 76dd8867b04299a7d616a1487a4b7812349a076f51b2828e01b45ef4790d890436eed147b51c2591dec8936b339a19fad3bb41eeafca8cda8c9904afbd2107e0 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8
-EBUILD pep-2.8-r1.ebuild 1149 BLAKE2B cc4ab4bd998e1762e9c474af66ca3c578b425fffd4e5166f3840a57a26d6c9831fa1ec0263886493e04dadf515e7a8589fade40b1dfb815abed5083fe503df50 SHA512 b4f5ca5770d0127f20b4b2c6145fa68703c5751df0dfac7739046e823dfd3f5193ecef150804bf59282c1286903d113727f3f30460258d3fea1d9d1116caafe6
-EBUILD pep-2.8-r2.ebuild 1048 BLAKE2B 5f5dd164c759d67445167a01f12f62e75263735530bcb29409465b4f699f3e1b5fde9af17e12827351419e8f0d05cb6879316e642877052ee970f6e17c9281c0 SHA512 d42b409655b3a126f7486e5e68e7a89aeb3b47a120b03e81ebac581d44b711ad379a8077b66ba9ab3e4c76acd108348d728416ac64399cb6952ab7764e396e8c
+EBUILD pep-2.8-r2.ebuild 1045 BLAKE2B a99680e225ea84c3b8e0e03c0b3aafbc6d0ac9bc335e3344991887ea4df4341ff8407fe8941fa8875474f37dfec26eb213a71541c2d1a21747b571d30a5a1fb7 SHA512 c126852d6705b8a47e6d7536c99a5c513ff921a001f29f4a02801b9b05edd07caa7440b6ff19abdad872df122357bd641dffb877af6664ac8c8bc5b9bc7e7742
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/pep-2.8-r1.ebuild b/app-text/pep/pep-2.8-r1.ebuild
deleted file mode 100644
index 59b13dc23d46..000000000000
--- a/app-text/pep/pep-2.8-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="General purpose filter and file cleaning program"
-HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
-SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	# pep does not come with autconf so here's a patch to configure
-	# Makefile with the correct path
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-include.patch
-	# Darwin lacks stricmp and DIRCHAR
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile
-		append-flags "-Dunix" -DSTRICMP
-	fi
-}
-
-src_compile() {
-	# make man page too
-	make Doc/pep.1 || die "make man page failed"
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin pep || die "dobin failed"
-	doman Doc/pep.1 || die "doman failed"
-
-	insinto /usr/share/pep
-	doins Filters/* || die "doins failed"
-
-	dodoc aareadme.txt file_id.diz
-}
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index 8e25853adc30..a5320f2d7272 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
 
 DEPEND="app-arch/unzip"