gentoo resync : 27.10.2018

17 files changed, 143 insertions, 178 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 72adbba85764..4130683c427f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 15af557fe6e6..04f23fded7f1 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,8 +1,6 @@
 AUX 3.24.2-CVE-2017-1000159.patch 1644 BLAKE2B dfb16a3fd8403d69212d0d20fa97dc06ad2b43d1c71894a0a2b366002b945110a73942446543276058ad5bb8ed867b68b3750eb9eed5bb23d2b130c14239f98e SHA512 a09d1e4a6f22c1b93ab322c1b7201bf4665bbc12b29dd9222db22b7d1b73f9ebc745c7e9b77e2bb54656916360757fd8007b6c38c004983b42f506bbaf4369ff
 DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
-DIST evince-3.28.2.tar.xz 3379552 BLAKE2B 64f77f2c19649f74291d34f6a0dfc49348d2a8e80cf2b37ef40b2c3bbfbd1198c40a47dd56ca6b04166e9981ebade3b8f74eeefa9234246968fd1e7fb4babcdd SHA512 6deeefc5ed52d79627ae892b227bcf023c6ea45ac02c6a3a7c9fa1004f5da2e36051bfea73f6838cb8f9aed8cadfd145173a5d3b2be405f1d1f06bd4fdadae23
-DIST evince-3.28.4.tar.xz 2174604 BLAKE2B 7f9bd298221d3b5b504e7cbaa6c8f99fa0ea54c418c92fef8be14a635a6ee20a33d1d4aac3af4a50af123e70de2bd22b80a3ed56ff8f7320b1d86629215af7af SHA512 655cff393af4102782abc08a999d5d27314860a3dfbbdfceb443617d696bc02b5c60cf5af6395fa51c1c4e20d8443384de35f1e725947b1d6c862122efaa5257
+DIST evince-3.28.5.tar.xz 2196432 BLAKE2B 992e37ad3cb82934efbdcd83afa89dc7589104045e828c6516650ee0a3fc89b99dff3fe0a723691e95adba9a5cf767a95ec18690697df15310437c7980ccbf55 SHA512 42fcf1396546f62910966b31bc657e5d3532a6bf32e87590b057efded1597de5765ed5c17ae98208a5dafca54da9c8e81f451e4133df656aaf4a9966da457bc3
 EBUILD evince-3.24.2-r1.ebuild 2874 BLAKE2B dba10da7fdf7adfc96c52ed4cde40c9793bec028e3c56043f9bd6a1acec62f1b9d3dd900bfee8281c19fbf7eb43bab8a6895ca3bad21fd49669f0ec106459612 SHA512 92527495b1f50a477458599f01c00c652bfd572d179130920c49ecde92878adb3a8bea317645a10ead7f04c963ee46a082629dc05e153aaa0ea47bd91ed92b0e
-EBUILD evince-3.28.2.ebuild 2836 BLAKE2B a7bb13c67bbcf995cecbf7e954cc02a422217d1a7ffc0330e142cc6cb7ac0b1e0660e14ba732ee4582f34bbba3dec6349752e3c7160b893734f1affaa1fc0804 SHA512 0dabd52455c49be144e03854dcbca8cb901399de94fb081623f55f88e3a5d0945ae5b2da4c884dc2c5e231c4939137ca272b02a72a60ad10620889a4686e0c6a
-EBUILD evince-3.28.4.ebuild 2833 BLAKE2B 180ae57826483e9d5abbf962838483adc074073145b12506f044ba00fc3c520f6bfd57607133ab7a161c760c6a54c09b97e2c202a9c3ffd84d698e029ebde7a0 SHA512 6e8b9f1a4757d75810dd7dd89c3572ee0c1096233e1f4f1e3a5cdeed510f51a14d9901e08db6c9f5eed44e6141a558904acb572bfb87835848be746a5725a40e
+EBUILD evince-3.28.5.ebuild 2833 BLAKE2B 180ae57826483e9d5abbf962838483adc074073145b12506f044ba00fc3c520f6bfd57607133ab7a161c760c6a54c09b97e2c202a9c3ffd84d698e029ebde7a0 SHA512 6e8b9f1a4757d75810dd7dd89c3572ee0c1096233e1f4f1e3a5cdeed510f51a14d9901e08db6c9f5eed44e6141a558904acb572bfb87835848be746a5725a40e
 MISC metadata.xml 780 BLAKE2B 2d04283b6f69a9ba788c9d40049767219854376c36c5c1716084b62e2710fdadce7c917d6fa58e51f5e249954e22a0d725cccbaecd66bf6f7417d31b5c3a8865 SHA512 4580592dd517fcba266be541cada8bc0225d35bafaa9505bd5e8127c3cffee65917f4bb0b9aee1263f2d96f5fc47f0cf9d59ffb84e97d2f4727e4504f753a4b9
diff --git a/app-text/evince/evince-3.28.2.ebuild b/app-text/evince/evince-3.28.2.ebuild
deleted file mode 100644
index 38a32708ad4d..000000000000
--- a/app-text/evince/evince-3.28.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.28.4.ebuild b/app-text/evince/evince-3.28.5.ebuild
index 84b26f36da43..84b26f36da43 100644
--- a/app-text/evince/evince-3.28.4.ebuild
+++ b/app-text/evince/evince-3.28.5.ebuild
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 020d6148464f..bf4239de725f 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,5 +1,5 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
-EBUILD linuxdoc-tools-0.9.73.ebuild 1663 BLAKE2B 8a5e2b42c4add946689d6b9219fcfc402bb338d2819b6bb32413f1e24545efddf3a4eed65e3b1ed84346e249cf6ef5fb104b41d7d880bd6519ee30919f699067 SHA512 ea7075321553e28ddd64e9dbaca32323362c5a4c9499b8fe5528b73a8f30754e69eb2e49a1e1e089bf69f3c803d9eb82fdd181dd928d66792ad5173e95c95913
+EBUILD linuxdoc-tools-0.9.73.ebuild 1662 BLAKE2B 9725e4727cc5a8275340f3e787a5b43b9ffafeb0db6043756103a706b355d55f7e157b640d71818c191e7751f16e898283cd6b1eedd727eec8cd3bb7c403bdbf SHA512 23662c61e8fa2f4bb373918e02ec5914efab16bcadd86325d1585a75daf6219d59098f3c3ed50f09307d588bcaf2fe27eb2e54107c7bed8728abdfee1c18c5de
 MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
index 18bccf5a4872..d86358004cce 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 4a07350a15aa..9b168eff6e17 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,3 +1,6 @@
-DIST scdoc-1.3.1.tar.xz 8776 BLAKE2B 1d11423abde7ec3e7b03ddc4f9698b7b78cac6972066c57886160974bd885225dc42793d19942c11ffd215f5dddd6453f66cbd083be03132b437b6f6f8a93c8a SHA512 a404df2e2eef76cc02c69f32eb131eaa4d4ed51e96dc6ea39400662f767648538fc27c618cf34c064004918a92940ae5400e91b7b628e431132cb9619d3e94eb
-EBUILD scdoc-1.3.1.ebuild 986 BLAKE2B 109e6dba273fe028e2965a23b995acaa3fa20ef3d528add4f0149d83f6ca18e2bf9c2b9f2686b34b6cdc056a8dea34ebfe616592d7513bbb7e7bdf3a43b24c86 SHA512 4d4b3162fec5e7b07adbd2fc712e3c8c324c771cf4bd7a9d78d064477e39ef64a71f56b4ab2253bc4c186aa50ad8563e7c91228b5970398df86e69308819691c
+DIST scdoc-1.3.1.tar.gz 9392 BLAKE2B 609f25252f0ee864ba3500961aa1048c6490278f4861fb4494ca62365a20d0cb128e53a6397bd089bd5a37f25f7f3c080f6921f1c4f4ca7e4af729c87e1994fc SHA512 6064de8c76eb959708b32e93634223565e5d4b390069d4fcd2d87d27bb472a333c60b21de87d676eb57ff5f8ed6445d3c3bd92dfe7dd611f9886abc38e8d21d2
+DIST scdoc-1.5.2.tar.gz 10542 BLAKE2B 07ceb1b3b57026a4e67e575f02042c2c882cdbd29712a4d3726ff39b4356bb63a35a99b21dd68fee31aad6fb2df14b1886bb2694098bc9096c5ff9e41600e7c4 SHA512 755c1c7fbae6cbeb75ca2aa2498cb3b2cf644e5118188c3e4a4636d74764b475b1818dcb5bd08ff70e017af9c1f8cb2e351db36a2cc98885724731e4247201eb
+EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
+EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
+EBUILD scdoc-9999.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.3.1.ebuild b/app-text/scdoc/scdoc-1.3.1.ebuild
index b1e8b927020a..c8999bc80532 100644
--- a/app-text/scdoc/scdoc-1.3.1.ebuild
+++ b/app-text/scdoc/scdoc-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/snapshot/${P}.tar.xz"
+SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,23 +18,21 @@ src_prepare() {
 
 	sed -e 's/-Werror//' \
 		-e 's/CFLAGS=/CFLAGS+=/' \
-		-e '/^PREFIX/s@=.*$@=/usr@' \
 		-i Makefile || die 'Failed to patch Makefile'
 }
 
 src_compile() {
-	MY_HS="./scdoc"
+	local MY_HS="./scdoc"
 	if tc-is-cross-compiler; then
 		tc-export_build_env
 		MY_HS="./hostscdoc"
-		MAKEOPTS+=" HOST_SCDOC=./hostscdoc"
-		emake scdoc OUTDIR="${S}/.build.host" CC=$(tc-getBUILD_CC) \
-			CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
 		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
 	fi
-	emake LDFLAGS="${LDFLAGS}" HOST_SCDOC="${MY_HS}"
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" HOST_SCDOC="${MY_HS}" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
 }
diff --git a/app-text/scdoc/scdoc-1.5.2.ebuild b/app-text/scdoc/scdoc-1.5.2.ebuild
new file mode 100644
index 000000000000..3c018008f000
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.5.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
+}
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
new file mode 100644
index 000000000000..3c018008f000
--- /dev/null
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index d07e21e4f020..5b682ab3692c 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
-EBUILD xmlto-0.0.28-r1.ebuild 1356 BLAKE2B d150d85a8c8791eeffb26b660ed2b6dba527175b31f0f9e7de4ca0cb061fcbff6d0a6f7a6054cd2c388d582d02ee399ec939aa5d669da48f33c4b69be6953e8b SHA512 a5774c9b19d77c4afbe520f8db5df3be0b03e9a6df8ed80506ae197020ceb00784a0de03dd10c86bed69cb36433bdc037002e6e135970404cd6286aa318e3766
+EBUILD xmlto-0.0.28-r1.ebuild 1350 BLAKE2B 50d672f0e32f0f109f379e0c6dbdf54a9991d1a00895e701f388ed189dbf3a179d5ef226acea2052580c46f737303b8fdd3903c5652082050c5c60c1e2a36dd8 SHA512 583d9f0ff482a7cb78e08d520ff5a128a8ed51336a952aa5ea1ad38e9734945006b9f079b28db72bb678c899c826beca8f6ef90c238483cc80e6e055b942c8f5
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 4942d1c4684b..55bbf56a33b8 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 7a666a6a29b1..942fb89cc7fe 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
-DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
 DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
-EBUILD zathura-cb-0.1.6.ebuild 1169 BLAKE2B 48bdabc0538c032080e8e25ad9b32e8114a7387ea772453e83382368bbc6b524245f02adc55afb75825cefd11108b00d62cfd7e09051ae224f022b961b11acbc SHA512 00d8287f33cd414bb78c34a682645e444eb84f59b58cac5ac4d6290f23fdba1c07f5894383747e253ced4cfe5128d28e250394239fcde54901a9ac0f401df6e3
+DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
 EBUILD zathura-cb-0.1.7.ebuild 1191 BLAKE2B 12a7784c95acc44a25ad571fa203063c332ad91af7d8c8b1533b0a9dc84350c4e9a07ba1fb81b37bf78178d4ea3b01e267185a3dba8a4a10d3dacc98bd3868b7 SHA512 8d1d8fbdc1e54f4238fa8e31df10c71662c194ec60b63eea32085276b86b9de115c9539c5f6260aadfc88a95bee1b6c3116badf83eb6e1e2c4d0603bfc256220
+EBUILD zathura-cb-0.1.8.ebuild 682 BLAKE2B 40cae667593f4484e2bc1fc4c0ea8da903020f360e31ede326c62470120147469f365b184ab1e27533daccdbff303afa59bd864824e260a4210b398dcd32b6dc SHA512 ecb4dd4733e756923925811b62273fb123948bba216f2ee9ef33ea9eec461891efe057d71ad15c267f8740431e450faf9903eb9fdd7795642afd8a9c550c2bde
 EBUILD zathura-cb-9999.ebuild 1194 BLAKE2B e45d6a066522374b807e917b6baca20ea91897a1b5cc99a2caccd2e9dedf5853774749a53c9c3009e4de36f2036bd09d14d7cb01cb7bfbb663c2d31f8b4b92eb SHA512 00eeca9e086cf608309fd780cf376cc40c5580de57ad42d79fc77bcc012ad799cb8dfce4530f3069e4a28b196925090b25e3a6882cae4b7ce121900798e63a29
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
deleted file mode 100644
index 8422c19f22a2..000000000000
--- a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs readme.gentoo-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/zathura-0.3.1
-	dev-libs/glib:2=
-	app-arch/libarchive:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-
-	FORCE_PRINT_ELOG=1
-	local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-		app-arch/unzip for additional file support."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
new file mode 100644
index 000000000000..431498d45edd
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 041169d47820..d596860ae936 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
 DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
 EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B 33d9faf3af3156f08f3a2ac764c3ef16c2fc32b31ff396eafe1027663d0464f735ba0349423e9a173aeb84498a5da7d3fe13606ae2e46a10eb5b20fa0bc5a08b SHA512 99caf865cbc7751aec41b38e1d179d52bed4523c1813554413b4631fda9318726cffdb476de2777fe35f80ee463c2364437e1b30e80271b79c106ad7f5b5bb11
-EBUILD zathura-pdf-mupdf-0.3.4.ebuild 646 BLAKE2B 806fe5ee655eb5c9d8871d6db13d3442cb330652f7d400a7372b78134607befbfe0a491d94a7b3625bb6e613172ee42a81ee08527444e362e52c721ec7378757 SHA512 266b87f0dc2b057203d57e222887ac297d1064ee4559f071ad13c9a599134392fa355b91782a19985164de2af4bf9ee96cddd2dbd559f5ab3c629d3f92e58b9e
+EBUILD zathura-pdf-mupdf-0.3.4.ebuild 733 BLAKE2B cb449f684a7fb77b8c337ead0f1c08fa914e5890392dea666be79ee05ea35fe2d81ecc47cf02aed295b29481eb98132176b46b889f18d5182b645d22691f1292 SHA512 fead9802e5d2113d187568f4dbf0c5cb55d95c763b69656a01a5c69f35fcc8b40854dbfe25251f721512c399f0fa4659bbf6ec48a373ea5f61e4b0ca75be7195
 EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
index 69b7288a1bfe..dcf685afa7a2 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
@@ -29,3 +29,8 @@ DEPEND="app-text/mupdf
 RDEPEND="${DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+	default
+}