gentoo resync : 29.08.2018

32 files changed, 321 insertions, 376 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 31f69bbd7cca..30ba73925f60 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 0596c4a9b93e..a3189fc68ee2 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,6 +4,6 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1
-EBUILD calibre-3.26.1.ebuild 9290 BLAKE2B 1604dc70aad55643625d11ba082087f24dd2812eadb6d52339d4b7ac054522b5653bb77f6890b841211780fb360a0d922d745abd20e33252e941dc84c198430a SHA512 1158d8a45b79f68d9618e568ed63bb274e22e33dcf5365644b32cd6711163bc4a111cc4abc411c985b8beb2222b5922960d362a644d8772aacf871b69f086599
+EBUILD calibre-3.15.0.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5
+EBUILD calibre-3.26.1.ebuild 9282 BLAKE2B a32a06282faae9116f819875d2e048608d77c8c9f2e8efc9dbf1607db4cf67436ff0424c0536b850a2ccbd4a115e92f4443c429b15b6daae9b7105a1809a1b3f SHA512 2ee7018b965a27f69d40fa455b7bb8e76ced57527a05b12deadf442571cc2fe63234b5aed01ad1192aea69f5007678392810687e9b9170ec6e8271646671e5f8
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild
index 21301bcd085d..f761e9c5d83a 100644
--- a/app-text/calibre/calibre-3.15.0.ebuild
+++ b/app-text/calibre/calibre-3.15.0.ebuild
@@ -30,7 +30,6 @@ LICENSE="
 	CC-BY-3.0
 	OFL-1.1
 	PSF-2
-	unRAR
 "
 KEYWORDS="amd64 ~arm x86"
 SLOT="0"
diff --git a/app-text/calibre/calibre-3.26.1.ebuild b/app-text/calibre/calibre-3.26.1.ebuild
index ab8c6f98f7ae..1b17039bb4f1 100644
--- a/app-text/calibre/calibre-3.26.1.ebuild
+++ b/app-text/calibre/calibre-3.26.1.ebuild
@@ -30,9 +30,8 @@ LICENSE="
 	CC-BY-3.0
 	OFL-1.1
 	PSF-2
-	unRAR
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 SLOT="0"
 IUSE="ios +udisks"
 
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index 7896a24329bd..150ed30a6a40 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -3,8 +3,8 @@ AUX cmigemo-1.3c-gentoo.patch 1948 BLAKE2B 5c182d0c9c93b06104d1067272d35b023386a
 AUX cmigemo-1.3c-ldflags.patch 502 BLAKE2B 3fc4c85592cc9feffbaeee636e8fcada10c7b7cd8696495239436808ddf9462da09713bbba10c3e5eb66cb45a3ec02e53f1e708fc0c1281dd96cc3e66db8caea SHA512 932bfad5afc4c90531cac96a9a7fb06d1ed690b3391ad9425c5ae1baa7caf2d8046d208e25816ea4ecfbbe44b2a95216e551cbbeb7808548f534853e6b817f7b
 DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
 DIST cmigemo-1.3c.tar.bz2 54323 BLAKE2B 4d63bde57c442131056e1aabcc702308243491de0632325b7a80af328e293c97479ac1733f29484a2ee7912f6d599360e7703d45612e8b30b52fd7a1228b5152 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1
-EBUILD cmigemo-1.3c-r1.ebuild 1910 BLAKE2B 2137be59b724d22a4304ce6b385ea2d7f18fa284ee0ac641ae1d96bb8237c0d9d46f1d5576693d062f05da606d03bbb455352002f0ec2270885024a92b7ab56a SHA512 f8c23bbb27d3903b67923effcb087ca39c3e02a6168fa35867271935e408e2f1787fb30e23cab917050933c8d5c12b8d00f52e233630273649af43f98be08172
-EBUILD cmigemo-1.3c-r2.ebuild 2065 BLAKE2B 7922babddc037ccdc5e0f3ba99c250b1f66c5c3774e1989b94a10e1be5ce76e087857264b808eaabd3d955107c9c92aa13f9f727a9ce68333c0b36eb8ce790a1 SHA512 0b7889d5d72b57f5b9b9d917fff39a125e08b0f762cf0bb455370f4297788a3dc2ce50071c65e4e4cd5a01e10c54af38117f2cc785b121ad330b3bcd416b1772
-EBUILD cmigemo-1.3c-r3.ebuild 2057 BLAKE2B 36218198cd736f2fd572a197f8706d6571a5cab235f2eea793ac5b5c572a26f917b7f5fe87d17e95acd082e9c79a0ce8042a4dbbeca6efb8c3a8fe0df7bd7b3f SHA512 3d8b729455a7c171a5f2069163a2ef9ca7ca2afb34e95ebcc060377e20cecb5d279dc3f8b910537301d5274203af96914d982c1eabaa8fed423259384eecfbb3
-EBUILD cmigemo-1.3c.ebuild 1584 BLAKE2B 3962bce2bd338cb0871af5410d0cd8840075950dc728474131616e98354874940fc98999a9b683d1558e118c11d40dc6e8e9ef755ad7ca2b88b33a8e9471245c SHA512 dcb4708ea6ba2ed0f46a4ac61b3ca2776aa131e1880ec5a7ef39e1a474ec00504681569b1cb0dcc328c02e4962d0c8408e78c0d37eb976749616e65c89f94206
+EBUILD cmigemo-1.3c-r1.ebuild 1427 BLAKE2B 1dac8bc6ba813acec59e3e17132330a742762a71ec6e97dc36debd2199a0a27db97e67c5a158a0938060f59445a286d34e3e255213ce658c2f9aac5aacef2b39 SHA512 976846e86885c9a0435ff36e389d5d8778738159f62a985660899420b7ce621e86057560243dc8540578cbe0ccb33e3a261660ba2641bf2a0e8321430edf86df
+EBUILD cmigemo-1.3c-r2.ebuild 1584 BLAKE2B 4bb59aeeaf8b428a3354ffa3508488f762b8cd8bad63a3f493908ea97c6c6fa48081e742cb47844e60a3304501a9a41969b87323befb2b2220899cfb9de44e21 SHA512 361932a88d926d6a969068e258eb242c12b1180abd5819bf07b199cb187728f8b782af1f9630e37a41c2cb0a022961998c90b0fbb9d06e45f2d413b16767e87d
+EBUILD cmigemo-1.3c-r3.ebuild 1576 BLAKE2B a18ecba544b095a268eb80eace0b596fbaed1fb2c2ef70f5c9eee2cbe481030c448c104426712e43fde8edace62d473b586f91903b360924fc29b488c0e2c562 SHA512 0f0d971ba48ed22fd5150f6724695120c6093e5425cb436772b5020d3a26b935e440e0d2aabdd2525eb7cd198bcfdd9f8b0bd125ff21f54060b24ad8c7261e05
+EBUILD cmigemo-1.3c.ebuild 1102 BLAKE2B 17e25d35db7bff1b72b865addcd4430d7b35b04f1421c6e6ed9c8bebe76d33493cdbb569a0630608a765d3903b4c1620ea3afe06026f29e5ed6e35996e8af2b0 SHA512 d7ab991b692b9dfee83b748be48e159ab2ab4954174384984bf434af80fd2e17d3aa2e5b54615c4981c8414725fa1ee7044f8fbad65530779130bee5d0e387a5
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
index 6c9e1cd83229..5339687735fb 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
@@ -12,13 +12,12 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~ppc x86"
-IUSE="emacs unicode vim-syntax"
+IUSE="unicode vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=app-dicts/migemo-dict-200812[unicode=]
 	app-i18n/qkc"
-RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -62,17 +61,3 @@ src_install() {
 
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
index 87e1a7d68af4..5949875af65d 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -12,18 +12,17 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc x86"
-IUSE="emacs unicode vim-syntax"
+IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 	dev-lang/perl
 	|| (
 		net-misc/curl
 		net-misc/wget
-		net-misc/fetch
+		www-client/fetch
 	)
 	app-i18n/nkf"
-RDEPEND="${RDEPEND}
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -75,17 +74,3 @@ src_install() {
 
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index dadb8751f0b9..5843c8f263fd 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -12,18 +12,17 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="emacs unicode vim-syntax"
+IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 	dev-lang/perl
 	|| (
 		net-misc/curl
 		net-misc/wget
-		net-misc/fetch
+		www-client/fetch
 	)
 	app-i18n/nkf"
-RDEPEND="${DEPEND}
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -79,17 +78,3 @@ src_install() {
 
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
index 791d191e604f..d00bfc14a73b 100644
--- a/app-text/cmigemo/cmigemo-1.3c.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -12,12 +12,11 @@ SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
 LICENSE="cmigemo"
 SLOT="0"
 KEYWORDS="x86 alpha ppc"	# development branch
-IUSE="emacs"
+IUSE=""
 
 DEPEND="app-i18n/qkc
 	app-dicts/migemo-dict"
-RDEPEND="app-dicts/migemo-dict
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND="app-dicts/migemo-dict"
 
 src_unpack() {
 	unpack ${A}
@@ -50,17 +49,3 @@ src_install() {
 	dodoc tools/migemo.vim
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index b67911fc9f06..b2baa312733e 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,5 +1,3 @@
-DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
-EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
 EBUILD libepubgen-0.1.1.ebuild 711 BLAKE2B 8aa60a1e03391e83c2c9f443a948dedda973c4c0bc96e6124466bf0a21c228b846c01394e0cc3a074d8b81b36142a120bb20aeeb44a74f037391c013e723f315 SHA512 c297adfc8e10f33a760053b3d763916cff52e4683cfcaafb2e277b69cce1efa0c2d7b3f5d69a084ef82778564d067e666411f71c6b1e7e399c1ee5be487b70f0
 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
deleted file mode 100644
index 300033a02b9b..000000000000
--- a/app-text/libepubgen/libepubgen-0.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="EPUB generator for librevenge"
-HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug doc test"
-
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-util/cppunit
-		dev-libs/libxml2:2
-	)
-"
-
-src_configure() {
-	econf \
-		--disable-weffc \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 3d3ea05306c5..efa41b3e8460 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,7 +1,5 @@
 AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
-DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
-EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c
 EBUILD libetonyek-0.1.8.ebuild 1216 BLAKE2B 0a9fe54ab84331e8ee1f0e2e947ad636637893aa4871b46f93bfa990e4fef859041a188a79876bf77510240d4485c0f814eae48d6db03cc91e2fe801b07afc33 SHA512 a426c1fff4ef90b238f3fea32b4c5011573acfd1a385a514af74eb5d34a41711041460744902bcb63362799e474341a7c3ecf42f70972f7a027928d4b9126396
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.7.ebuild b/app-text/libetonyek/libetonyek-0.1.7.ebuild
deleted file mode 100644
index d618f8eb3ce0..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	app-text/liblangtag
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1
-	media-libs/glm
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		--with-mdds=1.2
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index afda8b3bbac0..a23df988a026 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,4 +1,4 @@
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
-EBUILD libmspub-0.1.4.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
+EBUILD libmspub-0.1.4.ebuild 1174 BLAKE2B 5cccb7010d595cc75a8777060eaba558e63ef80b3fc4763ed3023b1789ab64d774b783718e21a4e6cefb743f4fa75eab066fb719264fa5cfdd461b5ec4f1cac0 SHA512 44b42bcbf1cb5eb637606e101cd9da33cd443bfdce52ad7eb2dc2715a2566fdbb01d3d106dd28162f73e9732c14c47a84f8327889db375e9ece4583815212d93
 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 16c01c8e0026..4b62c8571450 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 ~sparc x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 6d2a726edfee..c7e346706232 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,7 +1,4 @@
-AUX libmwaw-0.3.13-buildfix.patch 562 BLAKE2B 4ec40a613a1ebb88ab5d3d790ec68789ecadc9852339a661beace56b56ad1201d33ae3ae046823f61219b159f732e7fb08ae79f9fd59fa8832d34d9fdfd60c6e SHA512 c7a87b316308f4448988d70e07184bcad462b7286e3f690eec8f377dd63ba95653e010bac8c1e00aba821fbab72d9c22d67a859f3b6e9c1bc88b5ca56e3756f7
-DIST libmwaw-0.3.13.tar.xz 1258220 BLAKE2B 79cb4d8a91d361ceae70fa7a0145fa9f5e230bbafba1b0a586b10a1375e34511769d2a5d6b8ba9b6b9676a3cffc9ae6d22529a1920ed4bf932ef7e88ca7bae0c SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3
 DIST libmwaw-0.3.14.tar.xz 1276240 BLAKE2B 34a5b118064dcac37834c83b2b5a61303f3e2eb70e41322845ff7661a5494c0b85db0bb07c6bf1f357c2027cab1c515eade58bb6b4fdf845a81d4d079a414b98 SHA512 6893a7a8a72765a66973a94bc7de8b3b6061aa85fd9cca5e73cb2a4024cbe81f0c030df0b6383f24835643259c361efda5527813bb84a1b08d0089d509215888
-EBUILD libmwaw-0.3.13.ebuild 1055 BLAKE2B e11ebd9eeba3c2ae91dbf71e413eb2366a91b788e7394c34200ec1134bc7602adba37996699daa09de18711a9a00eedd96dfd1ee1c488e42c4c0ac1266e6eeae SHA512 13f090f1610613958c5f37070f41378636cd5b25f5a2f0899a6c464a61bc316a9429a0652c154945ae14fcb0c8905aef8eddadccd41419dd80dd025e9ce22a9e
 EBUILD libmwaw-0.3.14.ebuild 1008 BLAKE2B 79af8a588f1fe052538abe54532e7ce53b2739158ffe523e750017204f0c9f2a41aed880b7443dc3ace78399d16bb6d3b2f3a15c569618bb690eefd203abc220 SHA512 35d1a89cac999df584c2586a7c8d14535c820d2d9fc47ea7f598f166752004520b50eab6e310cf58912a3072c7a8e66bf1de690775bc1211df312a6184bd6c71
 EBUILD libmwaw-9999.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
deleted file mode 100644
index 5c9940e8860d..000000000000
--- a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9
-Author: David Tardon <dtardon@redhat.com>
-Date:   Wed Nov 15 13:15:44 2017 +0100
-
-    fix call of explicit ctor
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 2875a0fb..b844a9d5 100644
---- a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -1027,7 +1027,7 @@ public:
-   }
-   //! generic constructor
-   template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
--    : m_data(p.min(), p.max())
-+    : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
-   {
-   }
- 
diff --git a/app-text/libmwaw/libmwaw-0.3.13.ebuild b/app-text/libmwaw/libmwaw-0.3.13.ebuild
deleted file mode 100644
index 7fe40d2eb2bb..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE="doc static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# zip is hard enabled as the zlib is dep on the rdeps anyway
-	econf \
-		--enable-zip \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 1f81496b5d83..9402cad2a353 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,6 +1,4 @@
-DIST libstaroffice-0.0.5.tar.xz 682380 BLAKE2B 1f514873a7dcaf210fae77f32e88ce7e3e8652474f51616865cb95ff81e7ceb86d784aab0efc301b86b416264fd0eb59c9be717039fb6a4fb086c9d09ec124ae SHA512 937fc618bef79c9e25957f25f39bc829621b0a2da0213cbfb1b56c2b00d44f61bcd9db67d3e6329a4bd700a2c88fc743088381f58a96a87712b040c0ffc17fde
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
-EBUILD libstaroffice-0.0.5.ebuild 936 BLAKE2B 679e15b1ff60c00f82b0e2e847d3dae87877136aad694d07cdebc30b7cf2b7ea9f2b2011d019469b43bbe4c65f256225b1eb25e870d61adb9d7212e62fcb059a SHA512 fd6bdf21f011c4c47ef75a43e2e76305f2e57efcb67c713a23bb67b9422a4b1690b34048910c5e3b9576c03db934dc643312f19c9a638534979b12540538a087
 EBUILD libstaroffice-0.0.6.ebuild 936 BLAKE2B 8a9333c389b67dfa59dbb587e6860553c941b8db99156f4750f205f3361c11e4c0cb589715b24f99566396c3eabb01cd4323739b101ff1e8b6c2379f21e01f04 SHA512 3e123fc5ad73485aa3efdbdb4b588b7a2ea65566ae8548b7ccb8e655a89de09616060777ed6cedc61d02cd123a0d24ae0fd89d809a242101a7fafd2e2c9ef4d9
 EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.5.ebuild b/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
deleted file mode 100644
index 1a1f5ef759ea..000000000000
--- a/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-DESCRIPTION="Import filter for old StarOffice documents"
-HOMEPAGE="https://github.com/fosnola/libstaroffice"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE="debug doc tools +zlib"
-
-RDEPEND="
-	dev-libs/librevenge
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable tools) \
-		$(use_enable zlib zip)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 353e70bc63f0..dda640295ff2 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,7 +1,3 @@
 DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
-DIST libwps-0.4.8.tar.xz 648512 BLAKE2B b446c9999ff0e760569daa52fd24e42af8cdda78f2c0bc77d26cc25957381456f045dde1eb4ec8bd7999de29f658d67b2a493fdeacde4faa12a00aa28725603f SHA512 bf5d7aeb6f06e87f15ec8e911fb6436fb4e14839123db71488638f0e658034ad4ea8849ed83926af2fab9b50a7ef7410199d4a1102abc63c83d37bf1966a4afb
-DIST libwps-0.4.9.tar.xz 673784 BLAKE2B 7843de719d6c2ff3152b216e808fc06798ae77e582a644fccd34667e409ec8a34764f302c484bf991e653cd1bb8eaca48f68861aa50e5c41ae41373b5b0c531d SHA512 8703e60837c525ab24e40bb3e2e25244e9f4d2231699373b28d86430f6d7f818a5ba32de08f19febdb4f917f1a90e3b27f95e7d3200ca2d4a9101c262b37a30d
 EBUILD libwps-0.4.10.ebuild 736 BLAKE2B e6a30583fcdcff03e9ac9e6e6f71d56e684b9a6d1153da8db145ac699c1dfb08e6064b6106bb1584457e26a2b258732a647c4f25f9a449550c1f9751894e8735 SHA512 7960629cc3bec49bfdfb1d0f3188704b6d9d28887c1ca1a90e70712c46d09a63b636d60004a5b8471aa946fbfa553fc8b3fc49be6b80e70416441841d8477133
-EBUILD libwps-0.4.8.ebuild 746 BLAKE2B 60cfafa10653cb4911a6c8bc88fd54fbb36de63ba2a8d60a845155eb0e62018f78d7232711be572b1954cf8c763b1eb589b6e4650fcf35e7750ec3fc8ebac981 SHA512 45c309260c9aac532a096bd5f91dfbba32ed7fa79172958c4004f3073e56fcdbf1c32885391ca81cccc7871efca207580a50a97d7be0eaf24574d9fb9f2a9fbb
-EBUILD libwps-0.4.9.ebuild 748 BLAKE2B b524b053e2cd0e7bddf6e1be0f7c0a6aae415834cc182deec8a1181131cae204d15bc696f3617069a91d989d00a4ab15b9da07dba5ac9a76189e1811cf7b2f41 SHA512 05c507aaf579f55a194f9e066d0e99373aa7f199c1041ef96c3cc24bb5b231ea651f75b24cc6fa23898b68460fc87e7d1f0866ab67b85a8e1841860e80e8d104
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.8.ebuild b/app-text/libwps/libwps-0.4.8.ebuild
deleted file mode 100644
index 2e18f207c814..000000000000
--- a/app-text/libwps/libwps-0.4.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
-IUSE="doc debug static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libwps/libwps-0.4.9.ebuild b/app-text/libwps/libwps-0.4.9.ebuild
deleted file mode 100644
index 9cf94d783aa8..000000000000
--- a/app-text/libwps/libwps-0.4.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
-IUSE="doc debug static-libs tools"
-
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c825ed9adec2..5ff5c533aae6 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,9 +1,11 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
 AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181ddfdbb315b1f0a9864c834e4c69f52c0c16ed960705baa4c0067526a23d52dc0c681ed6308b1efb34d29242303d023109b48 SHA512 a51588eae9cd97f1d6abc6c41cf5daed7b3e43fe33a5aab756567effa1bbe24cea3b05cdb3a8d027820b13eb2f54e6121a1fafefbcbe1a7768b0ba1e83bf7aeb
 AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
+AUX mupdf-1.13-libressl.patch 883 BLAKE2B ab4c59b95f035686b39906fc7a25bc92fa034857bbac30c4f27b97a6ed98e86fa3a39f907c663779d652e7f02e04faf8261c23f045c14f1fe4a835db16232255 SHA512 f1e189d07ac87819541938312efbc11cc4cfb90a35f6cea4a143a9a624b6e361b7dbca254a4de5522eda93d3e465fc11e0536065d9af02c6681be8ac14c6525c
 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.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
+EBUILD mupdf-1.13.0-r1.ebuild 5214 BLAKE2B 5084a3f581138ec893379dec40cbc29f53bd6d5ab832960d8239ed410050529bfeb2cb0efc97d1e40cc29913fcaa1b144767f232c4e13f2eeef38857d8bde97e SHA512 813feb1aa5267790e9174ba57382b1e7d17c99a7e86a8c621447fb91c03b762edd9391be6c009ce6273a4ca644bc86b6518383a2ac1851eff093ff2a28c2ac77
 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-libressl.patch b/app-text/mupdf/files/mupdf-1.13-libressl.patch
new file mode 100644
index 000000000000..396a0e5b5db9
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.13-libressl.patch
@@ -0,0 +1,23 @@
+diff --git a/Makerules b/Makerules
+index f9b25d6..6c91c6c 100644
+--- a/Makerules
++++ b/Makerules
+@@ -106,11 +106,17 @@ SYS_GLUT_LIBS := -lglut -lGL
+ 
+ WANT_OPENSSL ?= yes
+ ifeq "$(WANT_OPENSSL)" "yes"
+-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
++ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
++ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.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
++else 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
diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..3f522e8dc86f
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
@@ -0,0 +1,168 @@
+# 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
+		# See bug #662352
+		"${FILESDIR}"/${PN}-1.13-libressl.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/refbase/Manifest b/app-text/refbase/Manifest
index fbebeb59fdfc..3cdd10834066 100644
--- a/app-text/refbase/Manifest
+++ b/app-text/refbase/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 837 BLAKE2B 306f387521e1a4004434e5eba01b1254d6c893515ab0164f96f1bf26c07dbb9d8216d0a2a59173096637f9279d23128d123ae21fe1c8c86c07d7f3dd8d069a30 SHA512 fab28207a5d3bff1c8cb499ced404d5ecf2dfcd27493c0ba8b4cedd14518a0d2fdee16e61c28c6d14daa486de80ef33725cc66b48f4fe1ec9e150e5b037f9f3b
 DIST refbase-0.9.5.tar.gz 1395726 BLAKE2B d39b2ac6dc30e068e1f0f4ba22ca03bc4741c337a32a6e47675bd43d135c018018d2f7097ca8d0e21f72f3dbe51cdd111ba8b9cc855cabb6d3855a52e48625e9 SHA512 68022eee0c15a4e733a8eef8cd5ca15d6e29a4f3559539657c4a38733a4338b51ef4b716cfd964bdd5eb94dda3c7f012b6e01deb59879f3dbfd79d4d8ce11305
-EBUILD refbase-0.9.5.ebuild 904 BLAKE2B f6f0d2db8ccdaf0071caf6cc60e89424e3f4c1d2923668c73e6d1d43c45995ceda51b8c795ec1d63bfe29bb879254a73b09ae4bb03f6d9d0ff1ed45dbb8b2a5a SHA512 42234f423b8e9c3a6f8d3c878d7974d7f672689cf9a6fa61d01978296d6faada55c4c5fc66c1338384ab7481128f19fe01b6cce8d2b9bbd910b6071fd94f4d4b
+EBUILD refbase-0.9.5.ebuild 873 BLAKE2B 58ac0ace6dac38c01be3352125d741711bb7b4a3526ffd391b968e6f7f61024da3f1c9d1a5379bcaeca0f33e32026370f089b15ab0967c5de71ea70dc54cf082 SHA512 b96fe4366cce32e221c265c891bda28af5f686d52e02efc1760d08be37b21672b2177578d5a08638a02e0e766616b7568f465b53896d500acc977940d63ec840
 MISC metadata.xml 330 BLAKE2B 9e35fe6ced389ecb38ec836735c1d1482efcc1c606f438f433a34543a726d317d903beb94e3fc4c24b6297f4e209e7f8a02bbf046d34fbf3b4fa2813b4c12e89 SHA512 0fbcf620763f7e60e102335842267a1b934695c96b50055e5d338b5504592990c8817afe416cc3b48f9da72aa3365b83ec448165d07446c20fcd4bdd6e5ddb77
diff --git a/app-text/refbase/refbase-0.9.5.ebuild b/app-text/refbase/refbase-0.9.5.ebuild
index f2828b542eed..47da213ccdbe 100644
--- a/app-text/refbase/refbase-0.9.5.ebuild
+++ b/app-text/refbase/refbase-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+DEPEND=">=dev-lang/php-5.3
 	dev-lang/php[mysql,session]
 	app-admin/webapp-config
 	app-text/bibutils"
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index c7a8a4b4fc11..c72aae165978 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,3 +1,7 @@
+AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
+AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e1509591ad5afcf529746a6ef3f4a5051add8923c399863f8b56c3144c9d758b7fa2215b6b593eb1e2b305 SHA512 7a2f8fc105988ce6847ce533051ed65ec49b2ac1ffa4ec076a78be59d219d8c18aee7170d965dd429b95b193bf5a4608d20002e9fa58b6abfa5b972bb6879f94
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
+DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
+EBUILD sdcv-0.5.2.ebuild 1587 BLAKE2B c24d31dde663516dfba35363d80896498da53dee8e344634228dc3971c2f194ab6d80286fb9de5c520a24fc30e098f1ca6d9b0cc746d3eba9220a51af8fd69f4 SHA512 5bc612298d2cb1b562acaef6e60156ce7b2103837f4ea4e95d1942ac4f0b8a65b849335a992603034e52d5e53626a7838ec6ab788e3e043361f3489c876413f8
 MISC metadata.xml 523 BLAKE2B a3ccbb4d5965978e7eeeda8acc971d81d6ce65f04e4ab0342c1da8d3de0dc5512c8f172a7642b5d1c6f201717f52f6a850f459dfcf61e10fa041a35998c9f0a2 SHA512 d1c4be3dea4d7cf435bb98f6a02cce92925c113fc17c505377659095b53c1857b2730fa2363910630e51dda847f6d85f9dd6dd80abece74b844995ca7a09c8c8
diff --git a/app-text/sdcv/files/sdcv-t_interactive.patch b/app-text/sdcv/files/sdcv-t_interactive.patch
new file mode 100644
index 000000000000..83d503136c0f
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-t_interactive.patch
@@ -0,0 +1,11 @@
+--- sdcv-0.5.2/tests/t_interactive.orig	2018-08-26 15:04:39.174389830 +0300
++++ sdcv-0.5.2/tests/t_interactive	2018-08-26 15:05:01.494995830 +0300
+@@ -10,7 +10,7 @@
+ 
+ "$PATH_TO_SDCV" -n >/dev/null 2>&1 &
+ PID=$!
+-sleep 1
++sleep 5
+ 
+ if kill -0 $PID >/dev/null 2>&1 ; then
+ 	echo "process wait input: $PID, test failed" >&2
diff --git a/app-text/sdcv/files/sdcv-t_list.patch b/app-text/sdcv/files/sdcv-t_list.patch
new file mode 100644
index 000000000000..8bd23892fc7a
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-t_list.patch
@@ -0,0 +1,17 @@
+--- sdcv-0.5.2/tests/t_list.orig	2017-08-16 10:14:23.000000000 +0300
++++ sdcv-0.5.2/tests/t_list	2018-08-26 15:12:31.501052398 +0300
+@@ -1,11 +1,10 @@
+ #!/bin/sh
+ 
+ PATH_TO_SDCV="$1"
+-ndicts=`"$PATH_TO_SDCV" -l | wc -l`
++TEST_DIR="$2"
++ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
+ ndicts=$(($ndicts-1))
+-ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
+-nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
+-nmy=$(($ncom+$nspe))
++nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
+ 
+ if [ $nmy -ne $ndicts ]; then
+ 	echo "should be: $nmy, we have: $ndicts" >&2
diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
new file mode 100644
index 000000000000..722ad64a802e
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/"
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls readline test"
+
+RDEPEND="
+	>=dev-libs/glib-2.6.1
+	sys-libs/zlib
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.14.1 )
+	test? ( app-misc/jq )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-t_list.patch"
+	"${FILESDIR}/${PN}-t_interactive.patch"
+)
+
+src_prepare() {
+	if use darkterm; then
+		sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+	fi
+
+	rm_loc() {
+		rm "po/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# do not install locale-specific man pages unless asked to
+	if ! has uk ${LINGUAS-uk}; then
+		sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+		-DWITH_READLINE="$(usex readline)"
+		-DBUILD_TESTS="$(usex test ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use nls && cmake-utils_src_compile lang
+}
+
+src_install() {
+	# with USE=nls, but empty intersection of LINGUAS and list of
+	# supported translations, this directory is required, see bug 583386
+	mkdir -p "${BUILD_DIR}/locale"
+	cmake-utils_src_install
+	dodoc doc/DICTFILE_FORMAT
+}