gentoo resync : 26.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-26 20:10:49 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-26 20:10:49 +0000
commit: c85a90f90521c7e11d618b527d6630cc64cecbd4 (patch)
tree: 27c1f04d8eab0e0140fb62887a6a5d4d87c32ad9 /app-text
parent: 2f51c9978dda4c6e8debca43e4235ecc86914032 (diff)
51 files changed, 331 insertions, 477 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index dbb7953ec261..17252897c340 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 0f41d6d37196..d0e6656558ad 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,5 +1,4 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1645 BLAKE2B 925e485b72bf5092a63ab4df36cb906f9751f5a306c119b95ab500279e242d2ab521d93bbaf5b7ae5291a4f84ac03cb456835bd3dc66fb2ac7ffe55cd4f4b65b SHA512 c5c18647414e40bd2985367d03c3f682ba7572e623afb9a9e68281911679c77e08185c40c5ab1bf89c743446e60f4558cb2f9cd21d022c1d4af605736cebe3f8
-EBUILD docbook-dsssl-stylesheets-1.79.ebuild 1634 BLAKE2B b204229003246de1268dfa223f007bc7ebd11286ff6c4f23e2412ebd83971a60b9fafa32ef24bc42af521861102a8a018d3ad4ed6ce44a885833142f15b72c66 SHA512 4d78c5387ced5775fb9fdaf9d92a5573acee95d51e6c299c309370bb3e53c921b8d868e65b109ba0cb49278897e9f596bc269186b52e270ba1d0d9d2b2c68000
+EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1637 BLAKE2B 48157798af90161d3f714241732db8fd7f09b004767e98855188bebc59bb4c24ff977b5abb0c8d2c6f3018c6a43dc2a27061fdbd5727e09c5bd277cf7241d911 SHA512 90270270b31d9051952672b6323529ab4f64e07ab906019ef36aa16cf8922b65a31c9a28556a6eb9f96322b7f3d1cad50139e94ef8f0fd254965ecdcd00d2f9a
 MISC metadata.xml 244 BLAKE2B bb7b24c64c26a7f15cd94824d3dcced7f4680be7b408e344b8255ab4d2811a85e0b6941172dc28e10077d58c07d16788e8e42725526e51968fcb07f340af90f0 SHA512 bbbde89bd3a4d4e2071d840c10a83781a0950bf6e362bc4e69a24ac9da5ce216ec338a935519e8913df63db8b3ecd12f6ac3868519fd1b1378285c923fd234ec
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
index daac4e556596..b1bae17e8c83 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-text/sgml-common"
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild
deleted file mode 100644
index 284f1ee3b29a..000000000000
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit sgml-catalog
-
-MY_P=${P/-stylesheets/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="DSSSL Stylesheets for DocBook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-RDEPEND="app-text/sgml-common"
-
-sgml-catalog_cat_include "/etc/sgml/dsssl-docbook-stylesheets.cat" \
-	"/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/dsssl-docbook-stylesheets.cat"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/${PN}-1.77.Makefile" Makefile
-}
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	make \
-		BINDIR="${ED}/usr/bin" \
-		DESTDIR="${ED}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \
-		install || die
-
-	dodir /usr/share/sgml/stylesheets/dsssl/
-
-	if [ -d "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ] &&
-		[ ! -L "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ]
-	then
-		ewarn "Not linking /usr/share/sgml/stylesheets/dsssl/docbook to"
-		ewarn "/usr/share/sgml/docbook/dsssl-stylesheets-${PV}"
-		ewarn "as directory already exists there.  Will assume you know"
-		ewarn "what you're doing."
-	else
-		dosym ../../docbook/dsssl-stylesheets-${PV} \
-			/usr/share/sgml/stylesheets/dsssl/docbook
-	fi
-
-	dodoc BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew
-}
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index 5d4841369b4b..a8a598ca0188 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,4 +1,5 @@
 AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
 EBUILD html401-19991224-r2.ebuild 751 BLAKE2B 88342ff6cbbeb2e0fcd389456bc469ab1c8470ffbad80cb6761f8bfd0a4a94884fbea9a3fb3e418944a08d353b59cc0bfdcc788001924a039b30acb7fc5df928 SHA512 48f9954963d403399bcb63dc18fa24ea36b28fa0d79f3612e504a37139cc3efe4a6a1537d349a9d2c62bef9c5f7542cb6f7359728747e90649145b71d14a494d
+EBUILD html401-19991224-r3.ebuild 770 BLAKE2B 179a7536508b34bbf0da36ad9f0257ada973087719fb0d99641180e41952f9fe61ce8ef5e88d1b3e796245f117766cd5291657d666cd9d20278e0209193a5c21 SHA512 dc50b833445d5901f5a18726cdebbd3c30584c738dbf6b5b00f45072b9dab856385ee9a6ab9ef0862818d132a3a0da17fedf4b4064e47d8e0f735868d0899471
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
new file mode 100644
index 000000000000..c6742475dd1a
--- /dev/null
+++ b/app-text/html401/html401-19991224-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit sgml-catalog eutils
+
+DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
+HOMEPAGE="http://www.w3.org/TR/html401/"
+SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="app-text/sgml-common"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+		"/usr/share/sgml/${PN}/HTML4.cat"
+	epatch "${FILESDIR}"/${PN}-decl.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins HTML4.cat HTML4.decl *.dtd *.ent
+	insinto /usr/share/doc/${PF}/html
+	doins -r *.html $(ls -p | fgrep "/" | sed "s#/##")
+}
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index e99d1c47b7ac..3d0e110359b0 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -3,6 +3,6 @@ AUX libetonyek-0.1.6-mdds-1.2.patch 1170 BLAKE2B a1161fa0d252801714b5ae011c8ccd5
 DIST libetonyek-0.1.6.tar.xz 1243364 BLAKE2B 00f11e91ab8b82fc2bffa00df48f2b553b922391047c8345dcbbd7a0d51fba54828bdc9bd9d1f36e66d63cbb10414784a36697d2a8eacd716663ea7fee57843c SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e
 DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
 EBUILD libetonyek-0.1.6.ebuild 1505 BLAKE2B 67e38cc65246357b94ef122e83722f778fa719ee9d978251de489522b791d47230f002ae0c92d17f7f290a9d2ef5d49b70fcab468ca554fbe4f944b722b36505 SHA512 2576240fc405e4ab26bf2c80c5dca3ea3723010f5a9b9052aea06f12c6073894dc57522432fa3f540379a89e267f8ebd7af6d41d3892ea0629a63691b404e60d
-EBUILD libetonyek-0.1.7.ebuild 1183 BLAKE2B 09b5d35ff2cef12a50a7356e45d206d1f94c3a6871de5ba8835e1d12cd0a87f71eea9cbe1a864f4bdc8e1a6e4159e3b66ce1726fcaac6ea46f0b1742b2c4ae9b SHA512 419fcbe9258a555d278426a1a311b14d24473612137cdedcd9fdd75b0f9cb3aa16109942443ff7bba9e6e1f52fd161a7e21cd8807948a3acdd752674db8d6b1d
+EBUILD libetonyek-0.1.7.ebuild 1182 BLAKE2B 0af6dfae44d842fc10a4d085bc533d3e48072e925bad91882b53a08cc3262f8a35c677627d85b81791cadc3a45df055c655743a0abfe92ddb01d25803c2df5b6 SHA512 bd054b5e7ceb6e1a852853e3854e8cda02883385e544527ee5230bb0ea96f3c6436c7e8a8b108896be4d25f22fdcd0412d18b9c9baf61e8c942836b92f68de0f
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 09b5d35ff2cef12a50a7356e45d206d1f94c3a6871de5ba8835e1d12cd0a87f71eea9cbe1a864f4bdc8e1a6e4159e3b66ce1726fcaac6ea46f0b1742b2c4ae9b SHA512 419fcbe9258a555d278426a1a311b14d24473612137cdedcd9fdd75b0f9cb3aa16109942443ff7bba9e6e1f52fd161a7e21cd8807948a3acdd752674db8d6b1d
 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
index fc13ce6b6bec..2ea9d0672134 100644
--- a/app-text/libetonyek/libetonyek-0.1.7.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 629556797e9f..799af75bd959 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -2,6 +2,6 @@ AUX libmwaw-0.3.13-buildfix.patch 562 BLAKE2B 4ec40a613a1ebb88ab5d3d790ec68789ec
 DIST libmwaw-0.3.12.tar.xz 1258972 BLAKE2B d6a6bf588f4039abb7288547127b49d90b5ce254d3852cfc479ce6771566684251aa46fc354aaae17f9cc9b530d11597d5bc76dde38380d41c5847bba763553f SHA512 8af8477ff6fc251600f9a66059b20fd8b9fad8d599c01e847d7185944447b3a34567036daff4d4510934aa1462bd4810a39467e8ac0ec223147b3b53447220ec
 DIST libmwaw-0.3.13.tar.xz 1258220 BLAKE2B 79cb4d8a91d361ceae70fa7a0145fa9f5e230bbafba1b0a586b10a1375e34511769d2a5d6b8ba9b6b9676a3cffc9ae6d22529a1920ed4bf932ef7e88ca7bae0c SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3
 EBUILD libmwaw-0.3.12.ebuild 1035 BLAKE2B 8bf84a9ba6a4bf3693a583436f19738c8ceba3141e06fdc00dbe28076ae5c5176f1a760efdc40c9805e2a9c5714e4f66346fc1328eb0914dc93a752d2bf04fdb SHA512 7c53399cc2575b1859fb5bbeb9ea2b11b84066119d3966def2addf60991b7c8c21da225a43e00c48cf6cc2130b1f82e98453ac637d0ee4ce0bd6768498731478
-EBUILD libmwaw-0.3.13.ebuild 1057 BLAKE2B 9a77b1f60999e3131b2a7cc96d5413f28fa511bded5419d1856dc2721b4ed2a21e6a029108fe4ccdcd8bb21ea5ad457cce5da0da5f131e10da64b61349d2f17a SHA512 2b8dce5c0855e092848a9436630ca0fbefe23763093f1482de12c208651e592e2c619facf714165fc1e0d571421b1296652ce7a57d3448410decc4236161ebc8
+EBUILD libmwaw-0.3.13.ebuild 1056 BLAKE2B bc102150313a3f593516e03a2c7b8fb334703989189922916c433b8d9fa6f91d912bf50f48fd65ca8cc6fa89821e2c2922a74a6a87e2037ffb10667b88572351 SHA512 18b3b457157cbbfbd9ff582b7d9d2126024440c75411a87c4dda466f6e8860129656a6de0d2bbcaf85e73c93a72c7cd81b490861b3a53328c2dafc43c5b9872c
 EBUILD libmwaw-9999.ebuild 1010 BLAKE2B 67f80ab66b469bc93209a4aedd242e712d8e1e5f12bba2dbec11bb62814a8a599c51f15955376e0452d65dd23dbf46dec3e886be49753aa5ff830bc27df27e7e SHA512 6fe07afbf646c96d4bcf22264cf8bb4de3bda52aff57d379eccd43c376b9ae96c82eb0a95fea134ccfed7bfdd0cb1907735451aa7ca7926e6ffaa734776324ea
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.13.ebuild b/app-text/libmwaw/libmwaw-0.3.13.ebuild
index bd2d45589301..e3dd082e1adb 100644
--- a/app-text/libmwaw/libmwaw-0.3.13.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.13.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 IUSE="doc static-libs tools"
 
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 09f101b0d7ff..bd06e76f2749 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,6 +1,6 @@
 DIST libstaroffice-0.0.4.tar.xz 681828 BLAKE2B df51ff21c56ffb3cece6dd4f9e859a9c2f289ccb3d77ee70b25fb04adc24806897195bcabdedf86ca074b54e2eb144a509a08b88ea894955a390a44741de0226 SHA512 d591e554ce108165f1952ae82835241df0f986ce51f1a4fe43d282733358bb8d72418621f91f431367a5c09f9a40a9784666ffa2da303c5543ee000b1d6abf38
 DIST libstaroffice-0.0.5.tar.xz 682380 BLAKE2B 1f514873a7dcaf210fae77f32e88ce7e3e8652474f51616865cb95ff81e7ceb86d784aab0efc301b86b416264fd0eb59c9be717039fb6a4fb086c9d09ec124ae SHA512 937fc618bef79c9e25957f25f39bc829621b0a2da0213cbfb1b56c2b00d44f61bcd9db67d3e6329a4bd700a2c88fc743088381f58a96a87712b040c0ffc17fde
 EBUILD libstaroffice-0.0.4.ebuild 963 BLAKE2B b00216abc52182194e8ca26cb9e5c61c4d170e84dfe041bb05042a1e4695d22d4435d00f9af7ffeaa562c2713502146a1cdf4956eee5b39270816dcedcfc8bb1 SHA512 0bc7d93ebf707efa1c9939409f044d0cbbd7042eea7abd2aabde17fba8e56092239770c17f1e3392583acc39a3e6d3c95d2a493ddc5d3337cef141d87f2b1020
-EBUILD libstaroffice-0.0.5.ebuild 938 BLAKE2B fe93bb316bdd297ff1eb08b0301d0d8d923ccc72b6ec88e83939df5289a17315a10ded6dd0c09ec2e7126a8ac93648a30b0cc80d280fec64310254a617e4fdeb SHA512 fe4d35ba9f0d4e811532a5a70c56a2e3b0e576220000ee5d1bd9348f7bf36327c2fe8f14acaf9c5f2244480a5372a4b0406d31595a0376629cb4876d459c976a
+EBUILD libstaroffice-0.0.5.ebuild 937 BLAKE2B 3bc4b737c803edf0ea9e34f277d3de0fa89e1af6ff3c840f1f10915ef23ec62b69c5d5905ab8e949584769f0f6c8188635250042ba59efcb26cd878681cc6e5c SHA512 bdb5684100ca658adc23a26756fd2e1c924d0c835ff47d92baf34860d99272605173745d6ac9ae394222f036ae799295380da299089132f4da03c8c8992a99d1
 EBUILD libstaroffice-9999.ebuild 938 BLAKE2B fe93bb316bdd297ff1eb08b0301d0d8d923ccc72b6ec88e83939df5289a17315a10ded6dd0c09ec2e7126a8ac93648a30b0cc80d280fec64310254a617e4fdeb SHA512 fe4d35ba9f0d4e811532a5a70c56a2e3b0e576220000ee5d1bd9348f7bf36327c2fe8f14acaf9c5f2244480a5372a4b0406d31595a0376629cb4876d459c976a
 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
index 20a958e6735b..1ffd7397f913 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/fosnola/libstaroffice"
 LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 IUSE="debug doc tools +zlib"
 
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 2d14c05d6fcb..d56c7dd2e1d0 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,5 +1,5 @@
 DIST libwps-0.4.7.tar.xz 595580 BLAKE2B 697d0572aa8dccc732b5ff3f23c3bacf2a82ea77442e819172a03a8b906aaee010fc992419d161f573efb3c998cc8d001a7431e16996f5348fe4aa80b8060bdd SHA512 d38b778016f8ca6a44edba86177d28a3f0bcd338e57276a615eeb9d470def71aa9326c3077789129418b38e88ae6f6d1901d08f5716081ba2eb9847a133c96da
 DIST libwps-0.4.8.tar.xz 648512 BLAKE2B b446c9999ff0e760569daa52fd24e42af8cdda78f2c0bc77d26cc25957381456f045dde1eb4ec8bd7999de29f658d67b2a493fdeacde4faa12a00aa28725603f SHA512 bf5d7aeb6f06e87f15ec8e911fb6436fb4e14839123db71488638f0e658034ad4ea8849ed83926af2fab9b50a7ef7410199d4a1102abc63c83d37bf1966a4afb
 EBUILD libwps-0.4.7.ebuild 773 BLAKE2B bac2dcbc511e78d0d071d3d0c6ae289e8484a6ee6514fd0cc14ff2f6eef17ac0897f97d6a57542c33ceb5fac1001ea35825e992001854023e0919c285c55f28c SHA512 b3dc7813691615c354c9fa862e1e8c64a26719392c81a78ac7c2ed4e7954b41d2dfc115ca01fbda09bb54964a1bf79bfba5329ff97a9e0d7cefa87f9f7a45a1b
-EBUILD libwps-0.4.8.ebuild 748 BLAKE2B be24ee4c6dea5abda78ef1385fe0eae24a09d4781c982e7a867865a60b86f06b58efe1320b65a3a69b0f7a355936d2e0a6dd428bb1fa60e328ec049abf9142d6 SHA512 6e799c04ef7fdfa66425d1975b6618a59335d3ad02ea4e1a893c1e167f23b81bcd55a05b9c97013a3675c205edde3a7c92649f1b6143cdae4d11106bbaa3dfa9
+EBUILD libwps-0.4.8.ebuild 747 BLAKE2B 06b6f4d5110ebad61b4c2f0ec574d7a6f3b483f9eb1510ac50c41244298c582a363fc65ac95d6fb1ac214990f05f230f8109f0bf5355df2d2002e280f0a57340 SHA512 ebb3a2590e17af430efe625141ead0b8ac18c01fbe956be059be12eff9a7a1d618aa36dc4e01d84b6146c98bad7483367ff4f44e8959d11b46777c32176f8332
 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
index d52a852a39eb..a0f61a04ecea 100644
--- a/app-text/libwps/libwps-0.4.8.ebuild
+++ b/app-text/libwps/libwps-0.4.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 x86"
 IUSE="doc debug static-libs tools"
 
 RDEPEND="
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 2881a8ee19c5..25aace313d2b 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,4 +1,4 @@
 DIST nfoview-1.15.1.tar.xz 88400 BLAKE2B 4e0f2d6df179a25f7fbf9b762dab70f1331d31fc1fed018e71101171d6bbcce9b67f9c4f4a3c35fbf22ed3123e90934b035290d3fae5a4d396ddc6fdc04ce133 SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426
-EBUILD nfoview-1.15.1.ebuild 900 BLAKE2B 0a928ff07a7d86cb40971c72c512919722685e1c13b511479c97e372de443fcda6742a447db24e392a4b69994346510698a970bdc73ca0e58b16a5b0b3656aac SHA512 f496971d2cb700f6841103428895a180fa9d850a3315da55fd44b0b56a2d0efd19b80d5e322016e5c73085c1d0d7d7ace8e7708cd5b792b2211960e238a7b57c
-EBUILD nfoview-9999.ebuild 902 BLAKE2B 08a26ee3f992e59902f538deb2f06ee4f86b2d64ff2b1a977c955d30fe01db31dcc7996ba39af49cb9ad8af3dd0047a4cddd7656daca1b6e3ea27fbc4065fcaa SHA512 0bd096440050195340ffd808689bba988cfb891f4c2032e43eaa26f8d8df96671c56b06ca5c8366d823fcd00c0a3e817b69b1bf03b7e21bf8cd7ebd266922bfa
+EBUILD nfoview-1.15.1.ebuild 842 BLAKE2B 7730db4262045788d0528425650fd3ea113616dce208e4432e4d9e8e1b371caf526bead621f6b2832598b5c70d93c125700f123cb4f1c377b65ea9503b7c6bbf SHA512 c84c7011845bcb522c33de62c70d1d02ef8709ed9902dd2d8dd1d13b9af9e559d974c090d7abbeda3672a76feb1948f06d78b3c688b2731631a134b7df40e841
+EBUILD nfoview-9999.ebuild 844 BLAKE2B b220d73669cf6149e399c65de520b1bcf4792bda60ca327bff958d9d05ef3816fc2c071e032a68bb459a65ce2a53f25e29275b878fe228deb35e5067dc1f0215 SHA512 73c9386c20e3609e2193c1ee015ec0fdc6a8749da2a61b6300065360bff821d9f042cae7bbbca577aa088db212c2c2ddc659441d86f8fc15a969309522d21302
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/nfoview/nfoview-1.15.1.ebuild b/app-text/nfoview/nfoview-1.15.1.ebuild
index e96a9fe27f54..eacdccc7a4a3 100644
--- a/app-text/nfoview/nfoview-1.15.1.ebuild
+++ b/app-text/nfoview/nfoview-1.15.1.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit distutils-r1 fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
-		https://github.com/otsaloma/nfoview.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
 else
 	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
 	KEYWORDS="amd64 x86"
@@ -24,7 +22,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-python/pygobject:3"
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/terminus-font"
 
@@ -34,10 +32,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index 58b524bbcffb..f8030006af37 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit distutils-r1 fdo-mime gnome2-utils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
-		https://github.com/otsaloma/nfoview.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
 else
 	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -24,7 +22,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-python/pygobject:3"
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/terminus-font"
 
@@ -34,10 +32,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index fa54e1289007..dd91ba08d21b 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -784,5 +784,5 @@ EBUILD texlive-core-2013-r3.ebuild 11429 BLAKE2B 4acb2e48b6400c1fda6ded3b4e098f2
 EBUILD texlive-core-2014-r4.ebuild 10720 BLAKE2B 2887ea23e06a64622722b5857fd68355decfc87ebc2a272991653b690b337368f69106354739f8137620126db522795b016926e220d2bd2cad8d34387a9f5060 SHA512 efa6656f4242526b174c43eb4349ae2339c9f2f59e68190ac87dba6337b4750fc0404140e5c6df3f61a1cd96ee4a6b48279d3c8e8ae7fbd828264b191d7115f3
 EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c8602212e6adf6f8b88c040ffea1f667355b6249c624fadfcbd5f2d63691d9e97bc140f347997b618bad10ed39ee02aa13 SHA512 409576c65f51cc4b824c3a98d2b34273c4163b8aee3de426b0b38bde573b4dc4e08c36225aaab15b550842d86778d63780ece0d55fed0fb7070dc1d28d3026ad
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
-EBUILD texlive-core-2017-r2.ebuild 11636 BLAKE2B a399c5374fad3eba15a9c3df95725d38644ccc8a91f53ef8457b3ab9476aa632008ac6190e40dedf8622831ebfd79fdd39901b08a4fc8bbd0f2c79f866f64b7b SHA512 8d6372725aff445e2207610decc2b914dbb2f02aa8c26dbe4d004a2b6b6963da8cd2c88e9756d366edf4103c55dd5acc2b59b6c32e12ab20f7000a17ad6d209c
+EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r2.ebuild b/app-text/texlive-core/texlive-core-2017-r2.ebuild
index c34e273db5b0..ff44aa3df6ce 100644
--- a/app-text/texlive-core/texlive-core-2017-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r2.ebuild
@@ -107,7 +107,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	dev-libs/zziplib
 	app-text/libpaper
 	dev-libs/gmp:0
-	dev-libs/mpfr:0
+	dev-libs/mpfr:0=
 	xetex? (
 		>=media-libs/harfbuzz-1.4.5[icu,graphite]
 		>=dev-libs/icu-50:=
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 15584022dcfc..491977063db9 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,7 +1,4 @@
-DIST unpaper-5.1.tar.xz 2861432 BLAKE2B 4f07af2ff86181f6941f924cb0a06c8268c5b50fbff3a25faea5ae9657b965277f9d33ff7fbcff29cff7c799fe9861c50dc3a7f583a1620ee6e92fdf42410165 SHA512 5ccd90c4c92774085df6cee5552d72d538d3ee553f95ca3d2bea850975ac6e728be97aa7dca194ba44ef8156c26c19d61d051c4581100f8c553998d9a86cefdf
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
-EBUILD unpaper-5.1.ebuild 753 BLAKE2B d3fe1ce1596a23782b1a35e15e85f1fdfdf359cee4f5ff72b82f39ce6048cb6553f3c261a3b9062cf55bc25bb23c070f7b233a1468288c792c490434441436d0 SHA512 4c5169cfaec2ad853cd9591a73cc87c24750b8dda1d58784348048a634d471992ce5dbf23db4e518e4c6b3bdbbcf5ae0a84ae901b7fc166a690190d0d5f5f3b6
-EBUILD unpaper-6.1-r1.ebuild 943 BLAKE2B 5ed691cf3ea38299f1983c16708f7d196f9892b82921483f8a548921ecee2cc2620c8f68775649c480a1864ce0393613f28c7fcb319bb663cff464506c6c3111 SHA512 cbf3e72d0c6cfa4924e78e6da5970b6a1cbe906ea4e32b725389888d2b609028d4b4c55773971269a1e5bc10e7c6c991bcee179595d62c9fd693491df94dd953
-EBUILD unpaper-6.1.ebuild 912 BLAKE2B bfcdddadcdd239959491dbea20ea4c61c4e539436333f6189f3db7173dce5e762c896368e8568dd2ac011e7e38f2ffd10ac3df6dfb46dcf3d6da2c8b05a0007f SHA512 e70fe61488b1fd2f48f41e6ca075ba1c46e5202e95ff150ba7adccf803d469949dcb4c3d1986ce62f523ae46fe277429216bf8f767fcab70202281e61cf1d352
-EBUILD unpaper-9999.ebuild 943 BLAKE2B 5ed691cf3ea38299f1983c16708f7d196f9892b82921483f8a548921ecee2cc2620c8f68775649c480a1864ce0393613f28c7fcb319bb663cff464506c6c3111 SHA512 cbf3e72d0c6cfa4924e78e6da5970b6a1cbe906ea4e32b725389888d2b609028d4b4c55773971269a1e5bc10e7c6c991bcee179595d62c9fd693491df94dd953
+EBUILD unpaper-6.1-r1.ebuild 887 BLAKE2B 2e03001a8f2f169b862f825b8c044974b061fd72f760b7fd40dcadf64d2d93b10b86a71dda21b70cc00ca4abe6c86173d3a6e27425d6b7ab4fbb99002e808ac0 SHA512 ddf900c742cb27a56e61647d55ba6f16a5167c69cd4ef934934a3c1b3900df82d019d84b434894e970e91164aad77b0c2d92d8c1a861108169fb618d61ee328b
+EBUILD unpaper-9999.ebuild 887 BLAKE2B 2e03001a8f2f169b862f825b8c044974b061fd72f760b7fd40dcadf64d2d93b10b86a71dda21b70cc00ca4abe6c86173d3a6e27425d6b7ab4fbb99002e808ac0 SHA512 ddf900c742cb27a56e61647d55ba6f16a5167c69cd4ef934934a3c1b3900df82d019d84b434894e970e91164aad77b0c2d92d8c1a861108169fb618d61ee328b
 MISC metadata.xml 292 BLAKE2B 5a4427170ed656c135d0cd81f46c3d472e306760c322c95f85e6183eeac77be6036d154791c2ce04ac28473c77974ebd2f26b302e5fa825a6c1db2437b1e6ee0 SHA512 67a23847327391a27c4acbb895e63063fa541de6fdf062887b1aa25a731bf2096e26f26c6cd62720bdc84fcbde256dbe6c9cc44687a7931d5e1a657ea684348a
diff --git a/app-text/unpaper/unpaper-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
deleted file mode 100644
index 945ae6370e42..000000000000
--- a/app-text/unpaper/unpaper-5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
-else
-	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( media-libs/netpbm[png] )
-	dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets"
-RDEPEND=""
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-	}
-fi
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}
diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index aed3c7c6ab3f..e2d4212348de 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,7 +15,6 @@ DESCRIPTION="Post-processor for scanned and photocopied book pages"
 HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="libav test"
 
@@ -33,9 +30,7 @@ DEPEND="dev-libs/libxslt
 # images. Wait until we get a better testsuite.
 RESTRICT="test"
 
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-text/unpaper/unpaper-6.1.ebuild b/app-text/unpaper/unpaper-6.1.ebuild
deleted file mode 100644
index 068f014b1ee9..000000000000
--- a/app-text/unpaper/unpaper-6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
-else
-	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="test"
-
-RDEPEND="|| ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[encode] )"
-DEPEND="dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets
-	virtual/pkgconfig
-	${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index aed3c7c6ab3f..e2d4212348de 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,7 +15,6 @@ DESCRIPTION="Post-processor for scanned and photocopied book pages"
 HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="libav test"
 
@@ -33,9 +30,7 @@ DEPEND="dev-libs/libxslt
 # images. Wait until we get a better testsuite.
 RESTRICT="test"
 
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 4b161e1c71e4..84ae567bec32 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,6 +1,6 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
 DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
-EBUILD xournal-0.4.8-r1.ebuild 1228 BLAKE2B 37bcd1b315a337cc3f79183e8b546dd4c7d7f8e5d38171de10335c986877691241210726c0d67340f1771b4d0f15bdc92046e7e38ef1d1e0b2eb6b05045cdec5 SHA512 a7956cc9a2e307b74f486f5f88bde00d19695d312ca9406659c1f741f124bd322b461ab1f894f11047db891159bb7449c6b6a9cd4250d551abb6e54821902ce5
-EBUILD xournal-0.4.8.ebuild 1095 BLAKE2B a7a1dfb0101d10fabc7c2d0b1dc9bc0c88d4834ebb4fdbb2adf4560b6280d596e30f1edcaf6c000cb459252ffdb72a851d73bd394ce3120557828de417e27d2b SHA512 860585238a9257533af0104efac8664ad79c4bd2d716e502d3e18774968c62f0af8db43d658c706b0747e04fd03e7257df968685593513a0279d402568e76c8d
-EBUILD xournal-9999.ebuild 1097 BLAKE2B 8d9c4b740a2f6d7a1598e6abf9d1a854ae75d1f7409b2c0fb456655ec6896fc42c69abfa31898388447743710532c7634407efa6df87092210681801251cf6af SHA512 51a02984a5e53a4a4ff79160a7872747b4c85fccf070395438fa47d21e8e515f77db4e64a4ca0588cdda042485ef50af5d426e17fe8891be48422a398347e8ce
+EBUILD xournal-0.4.8-r1.ebuild 1204 BLAKE2B a20cef53d6c52b4a352c7891283a1429f517f3b6b7563ac8e3b1dd94f3f96f5b12b97e8e46e96cd8828bfd34b38cd55ea6e7948f4d48cb914e0492ed07027748 SHA512 33065def7429ef8f79ad2e2f39d20effae9217744f30b1aff3a163d8b721d020c9edfd5491750646515428cdfa0b4691d8134f2448152ab4d45615abc4558add
+EBUILD xournal-0.4.8.ebuild 1071 BLAKE2B c2369f2ed2734bb8c0cdc4ef0dd9755d38695dd500f832b9c31f793b1a430f346be516d89e4961c22b209070f721bd88727a95aef2b80cd939dcab719ed670c3 SHA512 a6304ee06043c8e2ef57d1de563ed2efc64bb8098c5f88f5ab41d2aaa8e867a6fb71da6280c9fe5e4a123a93d89e8748ceea7d6772714823a29ac004475e1373
+EBUILD xournal-9999.ebuild 1073 BLAKE2B 57ef9df97e7b51e8703a32bcba8817f4ea62c6e2b8cf4df6b50df8b8090e398bb2b8366c891fb60f47e0fa16b7cf3a4543d351270eb66323ddde1d8fcde81413 SHA512 d249b87b6f0170acf7bb10117a31f25b2a105c12dac4c99a38cf5b883e40ef0a233b8726df37f148c3a51c14c85a72a1b3a20b59ad2b21acd7bf8eff608e6293
 MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
index 2d7a90544031..b30ab3a5467f 100644
--- a/app-text/xournal/xournal-0.4.8-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.8-r1.ebuild
@@ -5,28 +5,26 @@ EAPI=5
 
 GCONF_DEBUG=no
 
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
 inherit gnome2
 
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
 HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="+pdf vanilla"
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
-	EGIT_PROJECT="${PN}"
-	EGIT_BOOTSTRAP="autogen.sh"
-fi
-
 COMMONDEPEND="
 	app-text/poppler:=[cairo]
 	dev-libs/atk
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
index 9405f5279cc5..1b5655d9ad20 100644
--- a/app-text/xournal/xournal-0.4.8.ebuild
+++ b/app-text/xournal/xournal-0.4.8.ebuild
@@ -5,28 +5,26 @@ EAPI=5
 
 GCONF_DEBUG=no
 
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
 inherit gnome2
 
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="amd64 x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
 HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="+pdf"
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-else
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
-	EGIT_PROJECT="${PN}"
-	EGIT_BOOTSTRAP="autogen.sh"
-fi
-
 COMMONDEPEND="
 	app-text/poppler:=[cairo]
 	dev-libs/atk
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 9472f5a2e3ad..61353ac0307f 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -5,28 +5,26 @@ EAPI=5
 
 GCONF_DEBUG=no
 
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
 inherit gnome2
 
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
 HOMEPAGE="http://xournal.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="+pdf"
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
-	EGIT_PROJECT="${PN}"
-	EGIT_BOOTSTRAP="autogen.sh"
-fi
-
 COMMONDEPEND="
 	app-text/poppler:=[cairo]
 	dev-libs/atk
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 579434a761ad..0454fad7c168 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.2.tar.gz 6636 BLAKE2B 8ebf69deb8f78752661df4bee5f0c9f32cad4b3cec335d63fcd3a238e5b4daaa20659c4be7accf8187fa8c8caa6534260bff7ae69936f5180bdc733407610325 SHA512 bc2c8c846e40ee17aa9df989ca019382d1e4b3074376431c1a2f8190607c4d200ed159de161b8cbb1800bd1f494a770691fec803bc8ce661fe317cf753efc4b7
 DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
-EBUILD zathura-cb-0.1.2.ebuild 1055 BLAKE2B a25c044fbd86f991f90312989a3f963660788f3ad0272496bb3c0e6372742932cf80ecab7a74545da06326ff99913c93c9188efa671989ad6217a57fbe67b1d1 SHA512 1417187fec7a17d179f5f8347d8a96ed0094fb3513d7f405aa9566bc01ae859880fb785abd1776817ab64dac1b04bfb115f49eed0ad8802012e98b82b01b970f
-EBUILD zathura-cb-0.1.6.ebuild 1197 BLAKE2B 49af6ebecbc1f85e3205503629308de07447bb896f54c36aac19b950486421f2bedff5336d1a80f989325ebc2723e27beb0902343051cd1ab6a3d278d45e5ef2 SHA512 0355265692e55d470503503a1a6dffa7fc2c52a6c5abfd2132fd5a73900d7bbfd2a8ec82a779bf784d6054cf25262d4a5230397306213c9ef97fab41f25fd098
-EBUILD zathura-cb-9999.ebuild 1217 BLAKE2B c65c80ba93fb01368329abfd464de03009f30261945aadc749dc3ff274f44a984129b37b96665b6acd4ae3bf065f0c1a6dc31bb4f90971451be8d809e5b2a6fd SHA512 9b56596bfaa0194fb273c724f13a4c88368d10e94d3b32a44aee318ad7eb750d8c6809861e7f91afbec51fa48acf470a40ad6a7cb484eb0fb88d4d0bd64041be
+EBUILD zathura-cb-0.1.2.ebuild 1005 BLAKE2B 9bbeaf8c14f894ebfedc8e1716cbf32fd3e2ca78bf5866fb0fa5bd4bf6371aa946aa4bbae3dee5ab3c417e92a8d54fbd093c60b6c81b46967f3410b8f98d4a7c SHA512 2378f349f16a3e41f65a97a3c420de6b4240a6acd3935b0a0c149d8dac19649b64634b5140a74b08ec548c479a2a9636d40dccf24aeba3471e9349c8deb6d2f6
+EBUILD zathura-cb-0.1.6.ebuild 1167 BLAKE2B 7fd39375ad96f761bd5122bfafb12c1c4510f914759540b71bc6bbe5f8932b3204ad63ef44749982568bba07478fe47bad309e97b16e18e7cb902457366b34bb SHA512 d6066874e0b39ef1fbeed2b41a3c8e6c9954ccef71d5fa60c7ccb4c25cbfbdff3629b1dad4b406304d5f176ffb0fcd37a85eb1f5261ef89d5e6509076de980aa
+EBUILD zathura-cb-9999.ebuild 1170 BLAKE2B 2a96186c1ca27d3affbd6554920f3ec2ba265fd8086578330a11d09a4bd668fd0c81f229fb6fa19aaf6d7730787b69d351f389cb3ed5b038a445ca366cad8051 SHA512 65b2e3b329088629f30ad7152cd27230df51808ca371f233296824657a8bfd596093e922f342c2a80a4ff6fb0f01c2df33b6ddd3d666d76d82fa3f41b4835f2b
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-cb/zathura-cb-0.1.2.ebuild b/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
index 82427371fee7..c9d8877d490c 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+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="http://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="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 ~arm x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 COMMON_DEPEND=">=app-text/zathura-0.2.7
@@ -35,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
index f7465379776a..ff2cb89529c1 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
@@ -4,21 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs readme.gentoo-r1
-[[ ${PV} == 9999* ]] && inherit git-2
+
+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="http://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="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-fi
 IUSE=""
 
 RDEPEND=">=app-text/zathura-0.3.1
@@ -29,7 +29,7 @@ RDEPEND=">=app-text/zathura-0.3.1
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
@@ -45,13 +45,13 @@ src_compile() {
 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
 }
-
-FORCE_PRINT_ELOG=1
-DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-app-arch/unzip for additional file support."
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 227a2188c278..32698cdd593e 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -4,23 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs readme.gentoo-r1
-[[ ${PV} == 9999* ]] && inherit git-2
+
+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="http://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="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND=">=app-text/zathura-0.3.1
@@ -31,7 +29,7 @@ RDEPEND=">=app-text/zathura-0.3.1
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
@@ -47,13 +45,13 @@ src_compile() {
 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
 }
-
-FORCE_PRINT_ELOG=1
-DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-app-arch/unzip for additional file support."
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index e1c2463c22ae..819a45b47681 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-djvu-0.2.3.tar.gz 11181 BLAKE2B b032ca0af3df44ab7bc3fc9452a3b9e60139fb036a32c16ba65dab4ab884fc093423ef6deb4eee8698ca589099bcc20e8374709fdfcf3752f25cdc9b78a0b4dd SHA512 6fd9c1d367d02402bc5eaedd853ed0d37aee61a682772c3c2dd543d98c03d85b32cd2b4af4b7f7a6390e97206aa881ebd6df9783e7abf4222352fb4d57de4850
 DIST zathura-djvu-0.2.6.tar.gz 11137 BLAKE2B 23efc23cd53068abb3e118d6dc9b1e875c3f292d2e7ab49abbf6c599d6241c37959e9f74ac2b0f06838cadca0a07e39e1dda2e188f6861b72d4cd7a4bb1fcc62 SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac
-EBUILD zathura-djvu-0.2.3.ebuild 917 BLAKE2B cd1b6196bef4a8e51129827bf1c5c0c2e17ed749cea044b00c2225af197f6897e69eb1e54224ea0124169fb94022f9ed51bf60bf6a773d0a77abc4e78a27a552 SHA512 39e5db7b40f7779eeef0e1f87874c0e27ed51aa6b69b64e732c6cfe40625e0449c85693759ac5d95fa9e328a7876853f46a5031ba39c29c33be1336bd919716f
-EBUILD zathura-djvu-0.2.6.ebuild 907 BLAKE2B 6987fd45146771c116d62a1664147c605bbd04d3294904435486cf9b6ed04e6b2ae5acf737b6e403c57fca906fd661cc266625704027510c620c4decc346cbb2 SHA512 3729d9f8b567eab462d3737450400f61e5eda76676d84d90270cbd348ba4f2b5d7aeefa9c0c03ed9bcce53af866be7c1fa1103f2b9b3b112371f5fe4201e214a
-EBUILD zathura-djvu-9999.ebuild 927 BLAKE2B 88a84756e5ef140893af6abcf9abade8c53155c52f82b3fd2d142e847c0b95a9d3e88e7126d624572029999491ce1ab51ae4794403ff669d68f17bba66ad873a SHA512 ed91612447925082ec5f4cb5568645b566899ef5cfedc5ab24a6a854d6c0044a4d03cb5caf0d7cdc351c0ecc2d8e77931c265848c9cc49fc97a3ca1b63f7c4cc
+EBUILD zathura-djvu-0.2.3.ebuild 869 BLAKE2B cabd75ef2a4e68f8f2182cef885032737e7f72f78d16ac9e035a72682983ae59043882ac1c878f32c93d11b85cc2afbb563361e9c0436e121d7fb7f0c10c2dda SHA512 60594fa780942d59af33b998433b68a690a1bc27e075cd762bbff1a99e25e623e1ffb9d80d1b2394270bb9dc1455ef27020d8fcfcb097e59c85fd5159e86a545
+EBUILD zathura-djvu-0.2.6.ebuild 869 BLAKE2B e808ea94258c503b48549c6dd56c1f037454ef06721b3c703ee20665dd14560765d02e0f838a3d79cce7f642c0b2fedb9bb11b848ce346fb2af1f685b4dfb377 SHA512 dabaa16d72e7281c7ed9cf8deda8fb011401127f671738bcbc1f9c370bd16147acfe716c01a5e1011be19f4bda718eda25800cdc7728f52c6ea475febcde2ce0
+EBUILD zathura-djvu-9999.ebuild 872 BLAKE2B 5071f4f36896a78f03d70debe19c3580de532619c0f0c6c1f8670e12c572f810422542af6cb4480a07dae22760b814dc968a6f562deb58d56e85444f34b0433c SHA512 c276c5987c8a9737d4c6555c2858ad7001225fb69f1cb7f2076d80385ceb41db2a4b50448b39065488f54d19f09cd76f6cbbc774ff37e14d8defdf71eac42df0
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
index a73fd153f5a2..b02dee3dc614 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="DjVu plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND=">=app-text/djvu-3.5.24-r1:=
@@ -30,7 +28,7 @@ RDEPEND=">=app-text/djvu-3.5.24-r1:=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
index e6ef493fc4ff..2de3b88232f7 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
@@ -4,21 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="DjVu plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-fi
 IUSE=""
 
 RDEPEND=">=app-text/djvu-3.5.24-r1:=
@@ -28,7 +28,7 @@ RDEPEND=">=app-text/djvu-3.5.24-r1:=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 0cec0327dc88..810861d8da93 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="DjVu plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND=">=app-text/djvu-3.5.24-r1:=
@@ -30,7 +28,7 @@ RDEPEND=">=app-text/djvu-3.5.24-r1:=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index f5a321720e79..2ed312062375 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
-EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1100 BLAKE2B 29069ebdf3d529243307a1f632d67ac97b9ee9667500f65745649114a720cc6275547c53b13c8844cfefb734c72520222f143cc811b8cf994433fc8054eb592d SHA512 67d2f29fae03730255b5757fbf8645de625960b74a701fdade4397c8eed2261cbfc2aa08ec297c6394c5189973fcc4e10744f66a8bd7be5c44781a386bcd5755
-EBUILD zathura-pdf-mupdf-9999.ebuild 1115 BLAKE2B f94d6b66fb79445094e3cceed6a9352ac1b57ec268f8f74ff96159bb2c445e54dffa82ad143825fe6ba4422e09b334ccc6136eadfb4f0bdb6a05711257cb1f9e SHA512 d96d183feebd406a28e959ce2d9b390bf453c811d3836950bf39c87d5082e6c2f91126be3774275cb3d90b5ced03664e25216171c9d1db7aa65275441fc0b019
+EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1067 BLAKE2B 752b5fe80f5fd71ab0acae672bcbc3b1797376ef15e1639b72c7683e6f763a1e1761c5b2648ac3883ef129034953289e95bde9707e66476e2eee54590990b994 SHA512 5c7e87e45a69d3825603b0daac4c6059b65d4159e6773ee4c4c93d648f8b40a7348221e90bbe68678d747a2a4fffbc16d4254ea54e508ff694702cbffa6efe58
+EBUILD zathura-pdf-mupdf-9999.ebuild 1065 BLAKE2B a6e7d7e5d15bfe3c990042df363b67d3c535299356623e945ba6dd9907cbdf14b4a4f3272c878303cd4cb02302fea27cd37e154ce4e8982c684da298d5a9b47c SHA512 e2f18d3064982da07fa0a4dee55218f6caa9404f748000a90863984f0714dc2044be14533a6fdefebec4cc348646117e4bc447f4c7e1cfdfadb8812b4c433fab
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
index 28291c0f627f..afb28a916dbb 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
@@ -4,21 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-fi
 IUSE=""
 
 RDEPEND="!app-text/zathura-pdf-poppler
@@ -31,7 +31,7 @@ RDEPEND="!app-text/zathura-pdf-poppler
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 4f2eef4d1707..9b166e7d5b50 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -4,23 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND="!app-text/zathura-pdf-poppler
@@ -33,7 +31,7 @@ RDEPEND="!app-text/zathura-pdf-poppler
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index c9b2d4055c54..d503c4867177 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.5.tar.gz 9650 BLAKE2B 1c86e7011a7da134350e921aec63e550e79ca3091321496445c20fe778bdc992ff555eb9770d0a24a03f352831190d00f18b1118eff37391b1bdecbaabf13c6c SHA512 6ef167873c469a15f46a59a7e5cf1d50a3b9e3cb496f135da17975de7f9631b8e41076d1e7767f5715eb805d77e19e1bed3e4b39a0c49b0ea6ed2aebe616d56d
 DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
-EBUILD zathura-pdf-poppler-0.2.5.ebuild 896 BLAKE2B e709984b456fa8bd1b8906e2dcfe9ffb781970045136ae64685ee5ad159957cf0458a181d7f8ffbdda73ac691f58a0c947ef8bee548cb78c32898e7e5d789026 SHA512 7d828988116e65c1b64ceec761c76f45214d53a40dc0137967925f76759407896ba47533060c7117f50663beae546103edd4d01858dd863522bbc82996f08a80
-EBUILD zathura-pdf-poppler-0.2.7.ebuild 886 BLAKE2B 5510ebe3e07866a11feb229af655190c526d437e850b4255e917f0ac52e3c923f92621f8ff5325da49e26145f567a714ae2682bb83212d9325e0fa52ecdc92d8 SHA512 9e4d62e4959eab1659923e70570ba233602d4aa8258c273fc73c587b9f30b8641659288c933b94ae038a3bae427b10d7fc8625f6521d7b94bb0035517ea51b28
-EBUILD zathura-pdf-poppler-9999.ebuild 906 BLAKE2B 95cce2f2a5fb91e00b905195ad287f6e3ee319bb1bac2f625e9014c69ec50569f2ee15f59355a59b28653d138a1f608a9518bebee522ccfac0cde32aa1614136 SHA512 0dc360a72cd3c4ce6b7dd1779090e9a453d2ca8094b16da75f2c39a2bb49a65c82ea7dd4d0927412ac4f9b6157ba71d27203ab94cde1a6511abfb768af72a431
+EBUILD zathura-pdf-poppler-0.2.5.ebuild 855 BLAKE2B 116cd83adcb94d10109e1f609903c94ec2a70378282df0b17cfa5f8a0ee5dac4739ceb8c8745fb408fb66d4a2658f15f0e4f7b8acee3009ced825ff4d4252567 SHA512 66c2d1cb42235ef5b010164b688bdf24f045c62bacf60d5eb67c0b556e92f983a0a7793352d0ed6ef3ca81d1ae2bc82de774d0fef1562f55807aefbee183acc2
+EBUILD zathura-pdf-poppler-0.2.7.ebuild 855 BLAKE2B 116cd83adcb94d10109e1f609903c94ec2a70378282df0b17cfa5f8a0ee5dac4739ceb8c8745fb408fb66d4a2658f15f0e4f7b8acee3009ced825ff4d4252567 SHA512 66c2d1cb42235ef5b010164b688bdf24f045c62bacf60d5eb67c0b556e92f983a0a7793352d0ed6ef3ca81d1ae2bc82de774d0fef1562f55807aefbee183acc2
+EBUILD zathura-pdf-poppler-9999.ebuild 858 BLAKE2B f5c4ff74668680371db34bdf29758559da9f7e72f9106e41ef79e05a3ca092ae3ea6057602d6017e7d4724c81fb559e0a188fe9ef36bf9b4917738782f8752d6 SHA512 aea2f4aa2453ecaab02a3fe6e892006792fe23b0389c43b3d6a1bd828d86dbeaf02161b0560064c41b10a76eb70de6b76583362a610222c312ce342c45525976
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
index b7895c830dc1..1538318d9673 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND="app-text/poppler:=[cairo]
@@ -29,7 +27,7 @@ RDEPEND="app-text/poppler:=[cairo]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
index d7e559494352..1538318d9673 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
@@ -4,21 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-fi
 IUSE=""
 
 RDEPEND="app-text/poppler:=[cairo]
@@ -27,7 +27,7 @@ RDEPEND="app-text/poppler:=[cairo]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 90dadc2acade..adeffb644155 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND="app-text/poppler:=[cairo]
@@ -29,7 +27,7 @@ RDEPEND="app-text/poppler:=[cairo]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 4e2f56178952..54a44f245782 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-ps-0.2.2.tar.gz 5793 BLAKE2B a079ee3bca1e227e8014861cb0d3435d34b892f3a96c10a0c345587fadd94dcc36eb8d65bb9450f8cb6ae0e9df79bae01abcb1a33fe293ba4988863cd75e7e98 SHA512 4cedd614127b995ad834d5913dd5d9b3dff6172ac31cf42e8d43941815ac03a4872f41d7766c325f435feffa63364c9c377f760cd0540d2f36753e7df1c4c49e
 DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
-EBUILD zathura-ps-0.2.2.ebuild 975 BLAKE2B ddbb0acbea71cc8fbe309ffa3738cc75421200cb42841b5cd78352434b8779bca92c8e318e7fd99ab35004981d7427640f9ab8f8e33e9f90b10225eacfc8a2df SHA512 ea7456fb222d993419f9ceb92ae025bf55cc9f5a31ef09603abb8eeeb3d14c79cd02c21d38cab568b5cae38c19d497a41001a49b00d92e513d67a472df086bb2
-EBUILD zathura-ps-0.2.4.ebuild 965 BLAKE2B 7475718c36b381abfa1b831732079175b2421f7c61c85e02ac1bd392fa193f57182c4415bc03f277fbf2f91d6c67719a7e0e672425c53ef70ed3a0304fa0be44 SHA512 2f032d66ad48225c3ad918c1cf97e0693e9bdba32a35b1d8f5fc2193cb5ebc4eedbeda82ba1f06c058a5b6a8acdaac3cc4dcbe0ceffa66adf88b30b5c81d7dec
-EBUILD zathura-ps-9999.ebuild 985 BLAKE2B 5507d0e864e9c40bd8aee4c683231ac37d11acad16824c5de7c266d90e1ec46c544b23ac36fae5f2b7e968358a44900cfb6f8e481d3bd4569f529ab43b26bbce SHA512 d393e0dfe4691ca9cf2a92a56db8beb12bd8da16a1bd5ee2439381d4db24248a69dac39dcd3634b918c4c983a6de4d6bc9b1dceeb04aec0f0518986518b18bdd
+EBUILD zathura-ps-0.2.2.ebuild 925 BLAKE2B 31353e93c1a751fbf93588c6ea2f21a9cc5e2fe6ecae2eb10e139f06995e46c2ea2db8158d920605feb66203ac60feb36a47a6c1be5f277edc26e34889913f88 SHA512 151440b644811a83dffde220fed9c9bff52d240b1a13b9ee4cada8557aee0f48c115522ee55be31d2e48634257aa162efe95126cb8f523754a20aa81829f2ab2
+EBUILD zathura-ps-0.2.4.ebuild 925 BLAKE2B 31353e93c1a751fbf93588c6ea2f21a9cc5e2fe6ecae2eb10e139f06995e46c2ea2db8158d920605feb66203ac60feb36a47a6c1be5f277edc26e34889913f88 SHA512 151440b644811a83dffde220fed9c9bff52d240b1a13b9ee4cada8557aee0f48c115522ee55be31d2e48634257aa162efe95126cb8f523754a20aa81829f2ab2
+EBUILD zathura-ps-9999.ebuild 928 BLAKE2B 68e71f0708ef77be2b6809a9d479d4eda548bbfeaedf038a93a3dbc8b86211d86da95c7fd0c270ff74fbe154ec97caf5a54b6e9724d8294bb5d15f46f6f3cf63 SHA512 7e29aafd385345451517e29a9fc92613150875e82434a3565f922870562cc7de13e6efc0be75b3133a73d1496addc5444e6c32625822528c760dfe690574a2f6
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
index 63e6d80aa0f9..222e0fbcc204 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PostScript plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND=">=app-text/libspectre-0.2.6:=
@@ -30,7 +28,7 @@ RDEPEND=">=app-text/libspectre-0.2.6:=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
index ade2d3e11a04..222e0fbcc204 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
@@ -4,21 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PostScript plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
 IUSE=""
 
 RDEPEND=">=app-text/libspectre-0.2.6:=
@@ -28,7 +28,7 @@ RDEPEND=">=app-text/libspectre-0.2.6:=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index f2c470b53ec1..222eb1f4a012 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="PostScript plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND=">=app-text/libspectre-0.2.6:=
@@ -30,7 +28,7 @@ RDEPEND=">=app-text/libspectre-0.2.6:=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 9ec1506e3f47..4c0a58eebfdc 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,7 @@
 AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b8663404b4ea990dba509a64ce36d4921944a361b83e9ce83705b21aaa75b40441687c9b9e7d7d12634a47de99106 SHA512 8c1190b9511495328b841dd90500265e123fa4510e0660ca30510961b9222adcc72ad74f2e6a51d0710b9a86fb88d382c1f92739396804675a5b93cc78a941ca
 DIST zathura-0.2.9.tar.gz 196690 BLAKE2B e8c342c1d20845f8c6c3691345b853acc9a6752152d5cbeea3ebb9cb9ccdf25ece83d253c4fb1948bc7b09bf77a48f3e65b5113df9973bc699967ba7bb9a4c28 SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503
 DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
-EBUILD zathura-0.2.9.ebuild 1385 BLAKE2B e9d58e0a8bb97d47c2fd1a7302feb92b007c3969169db68309157fa64d93536c95c3e0bdbbeb1389db57d5b9c45fbd1fb1dc12de841ebd10a1610e29e6c726b9 SHA512 0b8423fc170a99ac0fb6834d2bf02bcda3df23203ede53c95a3b2218a0d1f54a60b69dfd28b036e91497ea863fda137c84d7c98523f48ec19c29ae2036009c14
-EBUILD zathura-0.3.7.ebuild 1533 BLAKE2B a21789e39a5fc1232b266a3ab693e4d3f8c5317e2cf3bc855c3c507960c3c49caf88a9386410202ea6e0dd6c79d69147d86897ba22017061684a8d6be4212899 SHA512 11aaac8f4d8ae9fbc764ad97ffde17c7e23c11c4b51c999d0ef5cfc0e3e2f5154cde16ca554223c1475b72ebb895ca0c5b2b14518959529e16dc9d6184f2b6bd
-EBUILD zathura-9999.ebuild 1481 BLAKE2B beb21302dbd8c53198bac3a53e0fa0cfa8368f0d3e065e3ba2f2656b367d9279ece9a8dcaddbdc78e4802721df79371e9a29695e5a5f8bb3da37c610bab5958f SHA512 6ffd492c792466d1f271f077fda3b9609fa40d2eea6ccbb9d2c16b656a7d3be923c2543c440f3a61173a2f58095fe9e08338d631e5731664da84730384d51dff
+EBUILD zathura-0.2.9.ebuild 1323 BLAKE2B 0a1e6da1d315b8cb8405a70305e76e6cc605e496bb2836e606020fcd34cc00f17326694320c037453f22c1800b8b3fc542595902f36e86536ed2509da2e3caaa SHA512 da29f736d795062246707a7bef0497e246198f4513ddd4de43df0f2ca9bf4a1a24dd7b4bc60274f548f412572ef22f535e17771585a29368548347ee1ec160f5
+EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
+EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/zathura-0.2.9.ebuild b/app-text/zathura/zathura-0.2.9.ebuild
index d72c7ba6207f..c4bb49e027ef 100644
--- a/app-text/zathura/zathura-0.2.9.ebuild
+++ b/app-text/zathura/zathura-0.2.9.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fdo-mime multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
+inherit eutils multilib toolchain-funcs virtualx xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-else
-KEYWORDS=""
-fi
 IUSE="+magic sqlite test"
 
 RDEPEND=">=dev-libs/girara-0.2.2:3=
@@ -34,7 +32,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-libs/check )"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		WITH_MAGIC=$(usex magic 1 0)
 		WITH_SQLITE=$(usex sqlite 1 0)
@@ -61,9 +59,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/zathura/zathura-0.3.7.ebuild b/app-text/zathura/zathura-0.3.7.ebuild
index ad77a66a0e0e..8281cf21819d 100644
--- a/app-text/zathura/zathura-0.3.7.ebuild
+++ b/app-text/zathura/zathura-0.3.7.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=5
 
-inherit eutils fdo-mime multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
+inherit eutils multilib toolchain-funcs virtualx xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
 IUSE="+magic sqlite synctex test"
 
 RDEPEND=">=dev-libs/girara-0.2.7:3=
@@ -39,7 +39,7 @@ src_prepare() {
 	epatch_user
 }
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		WITH_MAGIC=$(usex magic 1 0)
 		WITH_SQLITE=$(usex sqlite 1 0)
@@ -67,9 +67,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 52a3a9c5d867..70f20b7aed63 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -3,24 +3,22 @@
 
 EAPI=5
 
-inherit eutils fdo-mime multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
+inherit eutils multilib toolchain-funcs virtualx xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-else
-KEYWORDS=""
-fi
 IUSE="+magic sqlite synctex test"
 
 RDEPEND=">=dev-libs/girara-0.2.7:3=
@@ -35,7 +33,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-libs/check )"
 
-pkg_setup() {
+src_configure() {
 	myzathuraconf=(
 		WITH_MAGIC=$(usex magic 1 0)
 		WITH_SQLITE=$(usex sqlite 1 0)
@@ -63,9 +61,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-26 20:10:49 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-26 20:10:49 +0000
commit	c85a90f90521c7e11d618b527d6630cc64cecbd4 (patch)
tree	27c1f04d8eab0e0140fb62887a6a5d4d87c32ad9 /app-text
parent	2f51c9978dda4c6e8debca43e4235ecc86914032 (diff)