gentoo resync : 10.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
commit: a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree: e6d8d3589fcd01fbc3f1286185639163daa81424 /app-text
parent: fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)
30 files changed, 563 insertions, 65 deletions
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0ef5dea66989..c1159556297d 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,6 +1,7 @@
+DIST asciidoc-8.6.10.tar.gz 577208 SHA256 9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a WHIRLPOOL 36c097befed3befb901ceb0c42079488462c31acb92719f22da88a76804a692463c4ee37872c4b5e8c15711ed26734659cb52e61cd483b2062f0109a16c6af47
 DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
+EBUILD asciidoc-8.6.10.ebuild 2448 SHA256 2e0e435dba6edb83ab3364a863ee1a1fe1ab20c07a57cba4984b220ca81a7276 SHA512 1b9c5f396009c6c19353a9bcd63210f7bff6bbeabbc8084e0ee6e26d441d83ded8f6fa94ae8caf6a216f255f05eaed1789f240ac8cf02484b1e68b16a0fe4da5 WHIRLPOOL 89606c4c838634625bd0b35522d931ed735397aeaf8b763ca803c9ea3676b0dcbf770b3527ac934b70b1557fa95648152100e8e370d19a3cd8922f819cb80c3a
 EBUILD asciidoc-8.6.9-r2.ebuild 2194 SHA256 835d09e0de77cd9c3c7d11ff4f5452a0a94aa18b1dbfd728fc63919d82fc15fe SHA512 8800a9c0a0ffc8105315d468194b8c6aa0a23d2345b1a5aa4ba5950c3d2daca94f28ffd81f40e52c10d8de94d9f67306d69a3c00acf4008821ffb4c21625f190 WHIRLPOOL 13ce366a6bf41a82d7f95918d90b3fecd08be57132ca1bc3186865c8771886126a831a2bf417912590653e91035c7ba5ebf57146bda701444c0a44e5320976cb
-EBUILD asciidoc-8.6.9-r3.ebuild 2303 SHA256 e96f7fd6da782041c1e713215eec7e8e23be2dccf27b25ff424f2b17b58e57fa SHA512 2bec7c7ea7c879fd756ea4f47e375a52840f6f000047736a58a2f1df172ab46810263ad8e88cf3d7fbcfab18ed2be5927fb0fb39360d65bfc221df7aff010c46 WHIRLPOOL 8cace39c0d67dd076251b198e10faaea1317d803a7da8215bc401f98c1bf92c0d8360953c178b94077aa5d7c0de1aefb95120ebe21dad617791043f1e2b14445
 EBUILD asciidoc-8.6.9-r6.ebuild 2393 SHA256 7e0acb328c4862788ddddf78ee2b1ec648e72e8b9806bea687b4db78a7e25f25 SHA512 ef5cd7559f8c7a1a3de05a6ec2b81647b8b2bdb22efe6112d5136a36f83e32071a09febfe9a4310e437fdfa92b1e752bf0744010218653758fff5d39677a7e66 WHIRLPOOL e4daf52c05d9a81058b560d13f50bdb3bfecb95a419c3cf4f15e711013753304336e5e9659d23e243b3ba761590edc4256210c8c22493d259d32252970fd3a2b
 EBUILD asciidoc-9999.ebuild 3024 SHA256 63468200330bd85009b3a9e4a8028dd72b204f27faf21e33301f72c032d97d5a SHA512 a4f71cee5bdd91630d0e3be403666c0bd250f3425a15cdd863da3a429d8cab36304f07b463b2353c1296f8e89ddc28f5ce1e9e6aa0922577659c158f168e805d WHIRLPOOL d862ff60c6c4d956af1fc975dd9c7637eefc8bb99304570057fccfffcc0a137654250d76486e1b644abd4a6c281bb1fcd8e2a12b32ed0e5bc52b2bc9cb05acb5
 MISC ChangeLog 8762 SHA256 a65df8bab04bd07e80c0eecf86081fa5a7061daec43c4d1238143565f8391bca SHA512 a2a2f2961b82d23f1459c508af6aec923eef71d7408653f025a6beac20b9376b2d92774910276b123301e70f2f30d802cf03ddeb5869ef0a2cdccb4903299a0f WHIRLPOOL bf34214d3f4ef42e5156eeb7b0da45c5432be35654884dca44e459dd9dc91e6f496acb4af8a9c116d7d54c21cca30cccaebdb3f7470c78bb6c25f6a0c2ea486f
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
index afdfacf6638b..7bd3987cf6e3 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -1,40 +1,45 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 pypy )
-inherit readme.gentoo-r1 python-single-r1
+
+inherit autotools python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples graphviz highlight test"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-util/source-highlight \
-			dev-python/pygments[${PYTHON_USEDEP}] \
-			app-text/highlight )
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/highlight
 		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
 		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
+	)"
 
 DOC_CONTENTS="
 If you are going to use a2x, please also look at a2x(1) under
@@ -42,38 +47,42 @@ REQUISITES for a list of runtime dependencies.
 "
 
 src_prepare() {
+	default
 	# Only needed for prefix - harmless (does nothing) otherwise
 	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
 		"${S}/asciidoc.py" || die
+
+	eautoreconf
 }
 
 src_configure() {
 	econf --sysconfdir="${EPREFIX}"/usr/share
 }
 
-src_install() {
-	emake DESTDIR="${D}" install
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
 
-	python_fix_shebang "${ED}"/usr/bin/*.py
+src_install() {
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/*.py
 
 	readme.gentoo_create_doc
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+	dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 
-	# Below results in some files being installed twice in different locations, but they are in the right place,
-	# uncompressed, and there won't be any broken links. See bug #483336.
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
 	if use examples; then
-		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
 
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${PYTHON}" tests/test${PN}.py update || die
-	"${PYTHON}" tests/test${PN}.py run || die
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 338c154daa4c..a9b16fd89e9b 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -6,7 +6,7 @@ DIST enchant-1.6.1.tar.gz 642124 SHA256 bef0d9c0fef2e4e8746956b68e4d6c6641f6b85b
 DIST enchant-2.1.0.tar.gz 962857 SHA256 2cdda2d9edb62ad895c34be35c598d56ac5b9b9298f3dfdaa2b40a1914d1db7e SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27 WHIRLPOOL 4bb340288fffae6f8c6bc7bf21127ea812b79698d8be0f275e638fe47d1cd1c2b6b96b15fb0a0cec983d8b3db6c3e973e9521d86247c1e1df31f3db4ee80cb8f
 DIST enchant-2.1.1.tar.gz 961821 SHA256 5fad0a1e82ddfed91647e93da5955fc76249760fd51865648a36074dc97d526c SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15 WHIRLPOOL 955b1d853233529198b3a487406b0c481273214b5c54c22fbc992ea63f66143e278082f3d17370e9140d6211cf36586881ff73dbd07c66b01346d36cd2f2f316
 EBUILD enchant-1.6.0.ebuild 1560 SHA256 b4d196e3288fbd88bd4574d5e626fb0201b16ea0e08a9f6bfde723c8a84cb50f SHA512 e800eb39c1df85310236f1a760a218539622dc6670856482009efd2d7609b748e79f2a0aeb4fa565a17420226ebc7c7c87a4860e6e749b2b6d677ae308fa695f WHIRLPOOL ce5fb0f22e025e95dc7ccea943d5452758179add5b1f0e514b18dbea56f8f4332d1df041db13131d780bb67c320ff40911bfbb8d79696e90f76bcc76dc5f07bb
-EBUILD enchant-1.6.1.ebuild 1626 SHA256 c1b1ac5d5f9da4c9c67a7c3b281daa0d32f92c485dc9ef0ef713be2cde6e31ba SHA512 a6d011b85539119cdaed553918d30114c288e2f7898734b6d676cd732d18f6c62c0969ddd2fc39d3a953d6f40a562623c067f0f87ddce46b93b65bd31d9729cf WHIRLPOOL 961bad3f00d046d467c7166f8869e930be96391b5a5ff4737ee82c31f9cda70d7e7795214005a26a3ff40e4cbe13775baa69526c88fb00729df1a88c03b71851
+EBUILD enchant-1.6.1.ebuild 1624 SHA256 cae4b7fb8ab985fa645303c80b4de6f19ed192ec1b4c497166e00bba14012251 SHA512 2e56ead6ca31b3b76552b44637706768a6845fd5a7a570eaf1d57c56682c4e9c9f2f873c2b9a860bd4d39eb261d6a2bf116847cbd1e748268fffb3463c94eab2 WHIRLPOOL e0052af086fe419f899ca10e195d2a6b576654d8130040ecfc86a419147132af9cce24c6c92fa96a0b5986aa6eb936bf914b15f7cefe91a5c4dd36f7615694b5
 EBUILD enchant-2.1.0.ebuild 1432 SHA256 cc5175e06088360533c6820b16af78516bad0a2631193b763f7700e53324a426 SHA512 4131394259cc3280717fb1f6ebd7334289c0209d21af7659ce412f4124a537d7b920e2d4b6f72e1ec6303e5e53238209ad5dfd37e5c011ffe32c9557084ceaf1 WHIRLPOOL 9dc71b51aba6287ba46fb3ab5271d90eb34044d2b6dc3fa9d96d7a64248a743e95af929c521f11d05dc436ecb128f273ad0ab8ffb197386510ec237aa735529b
 EBUILD enchant-2.1.1.ebuild 1291 SHA256 9f63c17b8b5e74cfe3b3ae139bf6c1449de0b5253250bd93d6aaf220a34c4d16 SHA512 f5ceb6c6114864facef4a56da39a17324a86880c680fae23acc0617e97223ab9ac36996f2aae55bfbfb5f0861263c272969f93dae17f82bfe61601b232b26266 WHIRLPOOL 74acdfbaa22132559f85f551d7098e6e08c37e469f7a1d1e858a3c28828075a29225a6853c476c748691bc10e56bb25cc344ef9311db50118e786ba8878a2707
 MISC ChangeLog 3096 SHA256 8f56703204db0c230ca5127b857f95ea662a3919ccda4b66472e2b91e8ae35ff SHA512 eb6ad3c465a1589da77fdde411258c2dd39617dec6e76d8967034fc4dfe18f661c60bd11b99702c8f5eb4e87dbbbf90ff1890815a6d0423419072b0f038178d9 WHIRLPOOL 053a86bcb1ab83550337a0ebfa827450fcedbdd827b211835407c8e652acd7550ccaa617ae3374fb3d8f677192f82af1376a30cb85a19da77330ca1adebbf926
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index ff615eb5b756..6468835813ef 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test zemberek"
 REQUIRED_USE="|| ( hunspell aspell zemberek )"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index b8a4be466e68..f0d75d6d4496 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -2,7 +2,7 @@ DIST iso-codes-3.74.tar.xz 3455148 SHA256 21f4f3cea8fe09f5b53784522303a0e1e7d083
 DIST iso-codes-3.75.tar.xz 3461424 SHA256 7335e0301cd77cd4ee019bf5d3709aa79309d49dd66e85ba350caf67e00b00cd SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e WHIRLPOOL 33488e9a89217b3e1b0f1bad93168f7acb6b8f4693dffa6b8c417cd1dbbeff47a1cd63b82dec3aa879a8f1df7205114f934815acd8117f14bfcbc865a89b49f7
 DIST iso-codes-3.76.tar.xz 3474728 SHA256 38ea8c1de7c07d5b4c9603ec65c238c155992a2e2ab0b02725d0926d1ad480c4 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa WHIRLPOOL 205369ec0705f89f4710df1f89d1928d9c08582a259904f74de5e9994d50990265d97eb6168b5cd9481d3a8a5966215f97f1a50c0c9a469b3748a4034496e2ad
 EBUILD iso-codes-3.74.ebuild 2414 SHA256 477c16df8e2e858e43f3269ef537167ce98b817bc758a68f0bb59956c4ec6e83 SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca WHIRLPOOL fa517735f1a26e06e19271c2380f9b2d80f6e941649bdbf70bb748ad0e6b020ec83f633aca47cdfd45b7a977fa182357371c4b090231cbae8390445387597c61
-EBUILD iso-codes-3.75.ebuild 2423 SHA256 9bb35d3a73ad145e20b49c837f831c522942df8609e1dafaf70eff69dcd23875 SHA512 f8dc62420ddbd98b03a8e03fe54dd13c364fefd48084a177e8f5c3982c5a74521da2993792421a94ede39d9a7f2727ed45bfcb54360d54a4c4bfc599e936a700 WHIRLPOOL ba293d6081f066b7339f5f82a8b974dc822f7f174426ee6a8e40a623180884633cf422648a05e97ef582b5dcf594a7373ff87b24db06bb2d80f18cd0c972b195
+EBUILD iso-codes-3.75.ebuild 2421 SHA256 13a0285eda1d8f8f7956fd632c2d64d5ea80e0284fcc16fa057d03e54277bf8e SHA512 5184e3132ad6bf065519a77dd945d96b4759bab292c4aa8d246f0d4758eaf720bb6860868d298e71d4dc1bc7de9b1c3a0158ce927a9711788c47f8c24221ed62 WHIRLPOOL b0e3086cc25bd1295a5f2860a8ffc1e0a3299fe61484ba2aec9b14fa3aeb8825b8747c29f52f8a125e8b31b6be9ff16df4b29a9d50257d32e87a2ae4cb35bc41
 EBUILD iso-codes-3.76.ebuild 2423 SHA256 9bb35d3a73ad145e20b49c837f831c522942df8609e1dafaf70eff69dcd23875 SHA512 f8dc62420ddbd98b03a8e03fe54dd13c364fefd48084a177e8f5c3982c5a74521da2993792421a94ede39d9a7f2727ed45bfcb54360d54a4c4bfc599e936a700 WHIRLPOOL ba293d6081f066b7339f5f82a8b974dc822f7f174426ee6a8e40a623180884633cf422648a05e97ef582b5dcf594a7373ff87b24db06bb2d80f18cd0c972b195
 MISC ChangeLog 10618 SHA256 cf85cb0082cdca7aa6e531d20a4a642fe36798d6f90a45e041cf21cf2a4ead2a SHA512 f2d0aec9ce607b3b4f863b57b0df4c8a2d07253935ef4d2fe22dc62de94a832babb281736af1b6f64bc1cf6718b1d2be35d4bdee5c80259a594ea23cf6f8ca34 WHIRLPOOL f8ef40ff6c88d2b234d43972d0800cfa4db8afd64d45378dabaf92068aeb6a8d57959c91539080af01e3d6a0bcd74d0fa461743670189aae0f3a3f5c9e58d1eb
 MISC ChangeLog-2015 22706 SHA256 9edc87953f7c1ac9d191f101f536eeff8bac9c4b620f9f685be3e23d83e9f801 SHA512 33830c04e0ff084024ec72a34a2b3a7f660c4255d925ff398237d5309cd1f98e0250f9425f0f86d1a98856de31142a53c7d8df78c8302cb94fc0da07aca4b420 WHIRLPOOL 9f5bf706267dcc232a62c4264300abd47cc35eba4eaee31761e8441c60e2eaf3cb4826785755251484417fab653929337f1b90988fed1bc4327da4166b733f7a
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
index 64c8a46ae42e..b792c69f48ac 100644
--- a/app-text/iso-codes/iso-codes-3.75.ebuild
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index ce8582963e0f..1bf755d1ab8e 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,8 +1,10 @@
 AUX libetonyek-0.1.6-drop-test.patch 1105 SHA256 050d1c99de0f5564ef8f05fe7e50bb1fce99b79ad3cb90e8da4777246967e099 SHA512 a4d53634fe5fea85120773b609aa901f164a3a93a0ead44f25fbde433470c22a6956744a3b35683bacdf1d55f99f63da47a0dcc39c78f02d537eb8a4883cec5e WHIRLPOOL c37d20925d1c149520fe3e0ca0b7389b89b775ae1d2fac28050881968ed747f77935d23649bb5c7dc080cf86f26a95f57c21e25d1dbf02834ed418bc73e46187
 AUX libetonyek-0.1.6-mdds-1.2.patch 1170 SHA256 d2956ab771787d88bec86221fa2fddb5219cb9ac1d64d82711bccc5b33abba8b SHA512 4432fda977bbb0d4b1a5e163d4ff18372717aa93a12775117880b04daeb695e64ec69d3e577caef09fdeb133237a868c8afaece9b60fb4511efb55032469137f WHIRLPOOL 5919d6e09a8294b8f5afc2ba8838cf08d32a27291f4f4bf33778839c8e81d46040090da5060940f3384e6652d06306cd5ebabae4529a28440653c29ea3e8d8a0
 DIST libetonyek-0.1.6.tar.xz 1243364 SHA256 df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e WHIRLPOOL 932704f1d8bb1269e6be8e3fd7bd64af01ba0f098272befc747da9a4bd225bb201542bebf31d6e6338e613835fca4d7c6e2c1454df4ed764af30459393b6d73b
+DIST libetonyek-0.1.7.tar.xz 1256232 SHA256 69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f WHIRLPOOL 67183bed3e3b257727cbc43b44dda7af8129a795b3dac9d73e1f6e5f85ed058a5f2d672c9d482b9a6d7603ea231fba9663c27ca95f8820b0d802d46f523fade9
 EBUILD libetonyek-0.1.6.ebuild 1505 SHA256 5d442a601cf146b06ec3b4e3e2af63db39b184f7ca884254bf117349201e651d SHA512 2576240fc405e4ab26bf2c80c5dca3ea3723010f5a9b9052aea06f12c6073894dc57522432fa3f540379a89e267f8ebd7af6d41d3892ea0629a63691b404e60d WHIRLPOOL 8a05d9fec7ea894765218e711a8af2628078d4b061a3ee1d7995648d7bee83a1177adfd24f581a9595eb82f6fb22af74ca75993a10641d09cfdd568369a43ff8
-EBUILD libetonyek-9999.ebuild 1406 SHA256 2ea7acbaa598a2b9b0d311c21263bc9ffd01468f82f9a7321eef4c68f6241bd1 SHA512 a7f170d0b41c96cb16689685875b41770be1e0017b4b2016dce4f3b80a2ab82cd019cda84837a9095aac89f9a5f86f558fc274f2c19b0f84fe554fb83d241d07 WHIRLPOOL 9f1f3929abdae8eb93a1c25fac474242f5b427bbd5db461f7e07280cd40b6c5d42500e7d6960608f6998883910ea30ac2cabc115cb3b2cc5e71c69aeed4a65f4
+EBUILD libetonyek-0.1.7.ebuild 1183 SHA256 ee9c0f5d504deb5d3ae8c42a163a23cc5ebd5ebd3f078f5003a646e990a1cc54 SHA512 419fcbe9258a555d278426a1a311b14d24473612137cdedcd9fdd75b0f9cb3aa16109942443ff7bba9e6e1f52fd161a7e21cd8807948a3acdd752674db8d6b1d WHIRLPOOL 568976fe43f6c8c9875e6ac1c1a4c61ebff30768b03cebd849e3f3b41158402469fdc47743cfe713d72e2a4976db2bb7bd0871d0bffb4382eea430bf121fbe93
+EBUILD libetonyek-9999.ebuild 1183 SHA256 ee9c0f5d504deb5d3ae8c42a163a23cc5ebd5ebd3f078f5003a646e990a1cc54 SHA512 419fcbe9258a555d278426a1a311b14d24473612137cdedcd9fdd75b0f9cb3aa16109942443ff7bba9e6e1f52fd161a7e21cd8807948a3acdd752674db8d6b1d WHIRLPOOL 568976fe43f6c8c9875e6ac1c1a4c61ebff30768b03cebd849e3f3b41158402469fdc47743cfe713d72e2a4976db2bb7bd0871d0bffb4382eea430bf121fbe93
 MISC ChangeLog 6189 SHA256 9a127d40a3e9436851b5482fcdd712b137235123376ec7675a4307d8af8c1733 SHA512 1ddb61e03f4cb16a98380acab3f8523afb441641fea1e1b7987fe3eee8a864a34d06ab973ab37ddd86b4932e2ddcc9eb8cf0acf0c7cee683ec43dcf28efaf8aa WHIRLPOOL 501df2826e1bde3b795285bbca998143ab678f74ca1d924a57067dcb2dca93dd216acad22869e34a79a470bdc25bc859eefc974687aa59d31df98b8684457458
 MISC ChangeLog-2015 2369 SHA256 9a4563d8beab7e18e288e97e32a6cee1beadba719cc7a450f750e447e9f89b8f SHA512 17f6d0d1ab4b174cd24273c924e07440435e717aabd50a35a1e06bbfbef49a50ccea1eb727922e3ea8bbd5969d74ed4b3adccef979a9a6ec57f8e13b1f440d34 WHIRLPOOL 56afc7b2322bd406f85adc3ec4725f647034724a66a997fa2904fd15779c4748c305ce7562296a1c7e1b3fb976196b543f7028f9416319dc40fed79709fa1c69
 MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libetonyek/libetonyek-0.1.7.ebuild b/app-text/libetonyek/libetonyek-0.1.7.ebuild
new file mode 100644
index 000000000000..fc13ce6b6bec
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.2:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		--with-mdds=1.2
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 26e021ff6f50..fc13ce6b6bec 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
@@ -32,15 +32,6 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]] || {
-		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
-	then
-		eerror "Compilation with gcc older than 4.8 is not supported"
-		die "Too old gcc found."
-	fi
-}
-
 src_prepare() {
 	default
 	[[ -d m4 ]] || mkdir "m4"
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index dc82139cd717..9221ed5fcc7e 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,7 +1,7 @@
 DIST libgxps-0.2.5.tar.xz 346532 SHA256 3e7594c5c9b077171ec9ccd3ff2b4f4c4b29884d26d4f35e740c8887b40199a0 SHA512 f449c4cb989910797c84614ce9f141d4e9adcda0c18f309f656de397ba5deabfa9b4c558c81be7f52bc44c048c401616775989cd1ff9408eeea44f46ef56635b WHIRLPOOL db7514e785f46a3fbf32db9962c2644837855116acbbf37373388c3cfed3b88645c4a574fe8e2ae41913b68250d9448dd3566d9b15b258c74810262f4411f9b8
 DIST libgxps-0.3.0.tar.xz 93000 SHA256 412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013 WHIRLPOOL 00b8544245bc6be3d2a8d183a35f3f4936951fdc3772d1c7ee893ce5fe97712bc472d0ab3ff670c35655bb8f93941e9687d54e3b503075929958bc492c6fa42e
 EBUILD libgxps-0.2.5.ebuild 1161 SHA256 50acbe5dfda1fc2087899529e7c448e295feb9fc73a7b49ea407e1f9537a5cc7 SHA512 644ca138e4c1867fe00d1af8df9a64206ddded7fbec270623537a5f9c86a1eeb4c47fbb33b5914aa337e43d97ead97f3df61172bef751810b61ef7e125f4c527 WHIRLPOOL e6678a46470a03e9cdaf53eaff0222b488e576c7487efb323caa5a733020582297960c8c73343e79ff11212c8fe45f13922d075e1cee9897cfcd2a812d35a92b
-EBUILD libgxps-0.3.0.ebuild 1215 SHA256 238c9b4b1f232462f1c2d5ac3b1ee2291df1ab34c584ae1988970d95968eea39 SHA512 055c5cd9440b4c3bc51015bb3a91fcb803a28b9c01771852b8280f0cb87490aa9edc9b7c4a98846a29fd3c79a8e80aaaa29d3e585be87b79cd295e2900601419 WHIRLPOOL 8007c4838d7597a51fac250e01a86b847b415f50b315c68e65490c4b8db15c869be3e30d6bf695722c63d328c34ca3368c633d31b2d323d43652fc7aabbf8753
+EBUILD libgxps-0.3.0.ebuild 1221 SHA256 e4d87fd6e1131f29f47416f4abae71c35885b9865c4b49479276a90a144eb07d SHA512 6dbda50a3ab127793dfd709168787526a7517cfa71d71db6cb672137c1bf1e84bc68df31040b255be735183392d8a8a77d1e39bee4fe9a3cfaede4667862552f WHIRLPOOL 531a88dbe9e620e6e351465e12b61e249b35af403665d3ba529c9646be43e7cf9100d1ae0220e96c2dd6abcfc52cc520675230d01589626e1736003847790250
 MISC ChangeLog 4972 SHA256 f8f935360d9ba494c9a151072213f78790f7aa9b49c59795fea6ec9a86504cd5 SHA512 176b65d050ae3351176a6b88bd67ce9799329814af81af675f40af30b16884529659bf0e3961148675dcb0341b91c963e8e4995cd2e826c550985d44bb7e2a9f WHIRLPOOL 179f201323fac5a848aad32213fdb09f196f1b9fdb290a4431f2e8cf3ad24e1976e0ffb6ed5519be9cc38b7873aaf3d8d74c322f52d3b9184aabdb07acdf83ef
 MISC ChangeLog-2015 2913 SHA256 5f53c0b25af1aedc7958a36c0ad538bffe1fab5fe05e6b06c01fe1a063465916 SHA512 c255640c1e49fdd749247e19f12b3eb78319a0ed8e83f55a7d5864480fa9968bf5b673a9b1add88e0ec466cc0f0e0ae13f538acaf9382c7f7a0cfa38b2ead056 WHIRLPOOL 17a4fb510a28d801bb480608cd84cf3b6e15972a94eb9c0a9459faa01b2795740d6ac9aa27f3f6c4b4803a9580f373cc752da691dd22b15c22912693fdc64ef5
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/app-text/libgxps/libgxps-0.3.0.ebuild b/app-text/libgxps/libgxps-0.3.0.ebuild
index 7303f6bbede6..cd0fb4388b8e 100644
--- a/app-text/libgxps/libgxps-0.3.0.ebuild
+++ b/app-text/libgxps/libgxps-0.3.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="+introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 2bd391e13e84..3aea94105440 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,7 +1,9 @@
 DIST libstaroffice-0.0.3.tar.xz 679800 SHA256 bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6 SHA512 ea60576537761a5b969a861ac43c8d4a9da5e5261d0a31f3d7743f8507e6979ccd4cba1784e8c3d909c08b692349ae11e87428834fd3df5b8d56e423caa7bcd8 WHIRLPOOL c8ba69eb347aa0c77f886511d79dba5011aa0ff25c3e9f4ec4af31b8b9303fd9dc1df32742bbc3c87d2a7fba32a7f830fdc3a38ca391559038388f4d97afe9af
 DIST libstaroffice-0.0.4.tar.xz 681828 SHA256 6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a SHA512 d591e554ce108165f1952ae82835241df0f986ce51f1a4fe43d282733358bb8d72418621f91f431367a5c09f9a40a9784666ffa2da303c5543ee000b1d6abf38 WHIRLPOOL ac295aa290f92bc2071a56439dafb4280c52e2de8e36e6e686cdf31150bff8c87989bbc693cc4175d96c1ae5a155f21bb8f9344b0ed10920ebec161ba20a7110
+DIST libstaroffice-0.0.5.tar.xz 682380 SHA256 315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982 SHA512 937fc618bef79c9e25957f25f39bc829621b0a2da0213cbfb1b56c2b00d44f61bcd9db67d3e6329a4bd700a2c88fc743088381f58a96a87712b040c0ffc17fde WHIRLPOOL 13d97a0253020fcf485841fe7657fd1a8de54d0afddbcfb16624eb63bc0983b028cdfe5ba5c6666b570ac6e4578c47a452c9b6f1b79016989d7896045db70625
 EBUILD libstaroffice-0.0.3.ebuild 931 SHA256 444118af1a5a6972157fe5244227f781dba6f4b3e6434637cbea73ea22d9cbe4 SHA512 e03dfd8bc242f41415275a6dcb75d30a5e78918f504ffa1a7dc19923c74df4c5f23feae84a29553d9e4b5a84a989b583cce921dbf8bffecd3818fb27dad2a027 WHIRLPOOL 957399894bc9621e338c4fdeb754f99e252fc41195a133f6e6cb5efde946c04ed9125400aae357a2faccdbd08c07d4046ce52a5c288ca39f5ce95f9a403dcbca
 EBUILD libstaroffice-0.0.4.ebuild 938 SHA256 a429cbf2fbe83cd3cd5a8d38d27cecdfc277b6262f5bd9f36d8657c955a09bb9 SHA512 fe4d35ba9f0d4e811532a5a70c56a2e3b0e576220000ee5d1bd9348f7bf36327c2fe8f14acaf9c5f2244480a5372a4b0406d31595a0376629cb4876d459c976a WHIRLPOOL 4255b9fcfa87161e64eed85bac8eebe65173e12d928d66a23ea1c1092e2e180089e112dc87e5e9f0f6eb84f72b531662d4b1b1244d72496d72575f534ac59a92
-EBUILD libstaroffice-9999.ebuild 931 SHA256 444118af1a5a6972157fe5244227f781dba6f4b3e6434637cbea73ea22d9cbe4 SHA512 e03dfd8bc242f41415275a6dcb75d30a5e78918f504ffa1a7dc19923c74df4c5f23feae84a29553d9e4b5a84a989b583cce921dbf8bffecd3818fb27dad2a027 WHIRLPOOL 957399894bc9621e338c4fdeb754f99e252fc41195a133f6e6cb5efde946c04ed9125400aae357a2faccdbd08c07d4046ce52a5c288ca39f5ce95f9a403dcbca
+EBUILD libstaroffice-0.0.5.ebuild 938 SHA256 a429cbf2fbe83cd3cd5a8d38d27cecdfc277b6262f5bd9f36d8657c955a09bb9 SHA512 fe4d35ba9f0d4e811532a5a70c56a2e3b0e576220000ee5d1bd9348f7bf36327c2fe8f14acaf9c5f2244480a5372a4b0406d31595a0376629cb4876d459c976a WHIRLPOOL 4255b9fcfa87161e64eed85bac8eebe65173e12d928d66a23ea1c1092e2e180089e112dc87e5e9f0f6eb84f72b531662d4b1b1244d72496d72575f534ac59a92
+EBUILD libstaroffice-9999.ebuild 938 SHA256 a429cbf2fbe83cd3cd5a8d38d27cecdfc277b6262f5bd9f36d8657c955a09bb9 SHA512 fe4d35ba9f0d4e811532a5a70c56a2e3b0e576220000ee5d1bd9348f7bf36327c2fe8f14acaf9c5f2244480a5372a4b0406d31595a0376629cb4876d459c976a WHIRLPOOL 4255b9fcfa87161e64eed85bac8eebe65173e12d928d66a23ea1c1092e2e180089e112dc87e5e9f0f6eb84f72b531662d4b1b1244d72496d72575f534ac59a92
 MISC ChangeLog 600 SHA256 69b7b2578f81466a7aa5a3db4ac572596ee7f40f94e83859b112f96ff4857460 SHA512 9e3a3f904d8a88618bbaa01284f400d966f5ddaaf7c477622444c45c01731cbe3162fc2001e5dae6f3cb87e2a8d3f194fdbb39c486620b9677228562314c9c0d WHIRLPOOL 090168f6366b83a74ec6a1f1c4182883fbfaafeb29952c6f4884b28248334a5f80028bacb30356a2cfddffd7d538388378867ba2c0621b63d56140d432585025
 MISC metadata.xml 469 SHA256 b9365f3aaa1a2c5096e1aa2491f70d06c1a45b307f7c95f09b4a752dc1d034e0 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8 WHIRLPOOL 1d842b3fd1016936c82cd8fae1697e860dc0a65d8d3d7362be25f76472b1f5c9cc267ec92073680b572dafb1465d2de1f0db5b7ebf02d02bc6e6ef9162eaac18
diff --git a/app-text/libstaroffice/libstaroffice-0.0.5.ebuild b/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
new file mode 100644
index 000000000000..20a958e6735b
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="debug doc tools +zlib"
+
+RDEPEND="
+	dev-libs/librevenge
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		$(use_enable zlib zip)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
index 57dbc81af329..20a958e6735b 100644
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="debug doc tools +zlib"
 
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 22949cb347c3..f526ecf1963d 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,7 +1,7 @@
 AUX opensp-1.5-gcc34.patch 263 SHA256 679aa70752d48a6bd0d2ff32c8e4c7153f2ce6e50a43cdffe9a3f4bf23e68264 SHA512 bafb4149026e19ef3e4ba34f84510cdc5a5cb6621e58114d06b5979f74a21f4093f141dccd4166a1e83eaeb6310187efbc9a4cadae0c1d55a1929eebac3caa63 WHIRLPOOL fd17e36e11ff002941552ba35c18d843d219b5ad3fcb7d67e095b6b5e317137d3016e6d4c8145908de19badb33a8ab62d05f312071cee44ad3fcb4a68c042328
 AUX opensp-1.5.2-fix-segfault.patch 747 SHA256 d60915133b0d00ccd5453864af4e389e50825071f70bb2c7f88e53d9fd81246b SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf WHIRLPOOL e4028a8980d17dcc303166147cfcf24d21aaed79db70ebed45c259e94928f77042046da60e5e18f34c638d2635958e3e0ee04fd89317a495f1460ad728203c17
 DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
-EBUILD opensp-1.5.2-r3.ebuild 1917 SHA256 de2b546d7d060b4a3f98f88f770b1aa3c187874de3832bdf695afbe78358ef54 SHA512 4f7e27bfbdaa0987c3e87fac99082732a1f741ced6404cd0282b489a56b4164f8e8f4688644b55c25da5f31472e043557a119658658590f16f15822f078ed213 WHIRLPOOL 3431c7242b2d80ecc63c2b228c6c11d3793e9eeff95d933f3e3341b604e02c1f2e3fb19fed265cff60c1c645e6f1e2ab535508729ec0776116b6e4d1c97c09c7
+EBUILD opensp-1.5.2-r3.ebuild 1955 SHA256 f8b9b3a17c22baeef52822a8819e763dbb5265346335592549d5f023f9ec475b SHA512 f0318fbfaad8c2c8523cfa438d75b514c31c77d4ff8fee43496ef8da6acb3c1afcf1d1256aeed80b062aff420efc9f1bf819e4d4f27bf4b1f580d1dfc950b001 WHIRLPOOL f86873d4e5fd60567d2be359c1ef13c79cf8a13fc896169067f29bbb6d1cbdfc85a089781adc8300d0e7cc8cf4376a69d1311a0c0ab467e99c57c9f927f09b51
 EBUILD opensp-1.5.2-r6.ebuild 1956 SHA256 5fcb5db5298b673078ed1bf084122a523a5421a280547f6fd70af7a9cd82854c SHA512 c0305b0aad809dfbeef279c93cfe6366b7989a43c636203f37bb9dd863017c9cf5197baea5a3836bd7913ea2d58cae329f6423623940e44d0b7a399e5ff8afea WHIRLPOOL 3519abcd8eabbfb73b46b202f412b170fdf6e12d96d5e2d2e4fa0823fbcf34bab358c882de32e098f870034cb611c65a9826ec678ce6745649a36a61a287aa06
 MISC ChangeLog 2308 SHA256 39f03a192deff58d623a4f5505e8778b7efc803cc06b2c53351c0898b235bb9c SHA512 5e42030043dc81b6354cb59d2b4bd2b2f570f4569a13b522d0c2ca23f030e2f882cdec27e22ae7b054558703eec4b9157dde98825c4119cc716c8d8bbe043fbc WHIRLPOOL e9282199927cabae628767bfb7fcfc70ee3d50677d2a960246b084728c3c66d1fc5cb8f72db7a5e6f5aa66cfd2fe80d625bebd6c7763b01205e90e3fee454001
 MISC ChangeLog-2015 9194 SHA256 085d0f865e1ca53847addec0946b26d7df5db7739bdef9b818c98aa8faa943c6 SHA512 abc62ec98d05235b3829a5c9c1a49b67194c1d5e0fcad5d6855bc0e9195cc923008a2bb8276752d35361d33f4618219e2d91a7de3014f8368f3d825fa70d2657 WHIRLPOOL de03203e03881b3e290b8ca4f5d0c13b9cb65010b91d1d3dde4176907057aa6c8f89454ba39e15bd965229d3c9d8ce8313a3e4a87440755f2bfabaf7dea1a226
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 74e59561b3f4..4bfee9c3144a 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
 
-DEPEND="nls? ( sys-devel/gettext )
+DEPEND="net-libs/libnsl:0=
+	nls? ( sys-devel/gettext )
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
@@ -25,7 +26,7 @@ DEPEND="nls? ( sys-devel/gettext )
 		app-text/openjade
 		app-text/sgml-common
 	)"
-RDEPEND=""
+RDEPEND="net-libs/libnsl:0="
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 73aaa6ceb924..33a2614cfa8c 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,6 +1,8 @@
 DIST paperwork-backend-1.1.2.tar.gz 54340 SHA256 19b15ed995b06bd9d9a61c82389983feaaaa6d5dffe41b88e87bbe3a5e297dd8 SHA512 626a4e44243769c0982d2a4677e35e4c3431e6b68b05687f13574e1f9cfd026d0b949e95e53ea37c976ea5826883eb2ac672cffc346eb05631f3498bb525391a WHIRLPOOL ba197dfb5d131e522df9a8b8d77c8a94e01a1001dede460d8e7ecce6c413c1e7735d6bcd19a739b01b4abceb72c88ca654aa59b2a1513eb4aa3bf68132e07330
+DIST paperwork-backend-1.2.1.tar.gz 63417 SHA256 397a829b741a7b3e311aa239c8bb9e9a21f9596d37c64c99d1f00aab3c52c4c3 SHA512 01878b8580187aeca45248a133a92b83c3f8e8012b6bbacc6e625ca447979c01633573cbb59a4460b88aae6f89db2ae618c27019bd940a391a30dccde1c54696 WHIRLPOOL 7a0f80a581d1077ef57a18ee511e222cacb8496f68fa12efd155790e32eef1bbbb2de984942be0620fab2936f1436325894ee2c0dc22bd6b43eb053310a1d0e5
 DIST paperwork-backend-1.2.tar.gz 63167 SHA256 321f1a637b4df6c8d01caa2d172ca10c6285d1515ba75f594eeee71643ef5378 SHA512 278d7080c9806a6ae68cb15ba9df2ac22bd2c120f0e77a9d7eacbbd6e70476d4fb803c572216e580a068527ae8c10c3f2e66199aca3d94949e655c08214beeb1 WHIRLPOOL c064abc9feaac7a8d55a9e712bc3f0c61d60c7518560d44328d4cf3147614914445c9a29598b4d536e29186af793851acfcc6d2b0e3d5a3f7b93ed2987bfe144
 EBUILD paperwork-backend-1.1.2.ebuild 852 SHA256 c90dd4c13721da6b2f970bb894a6dd70e849afbc20dfc36795d01b8d4ba6a53e SHA512 a0cafaaa7704ba1f43450c8e39a0015b20cf6a5b11d89041de91dbedb01f163df52f6ed4c69817811ad1f42aeaf231dd305c8340ebdaaff141121c6c980ea6ea WHIRLPOOL e231d58b702a1e45988eb8ff2a717e97d49143b556de664b7dc5c0088eeca4aec51672d504794a0517d44504c6df49decd46d3fe139a731ea91b261a3915bab7
+EBUILD paperwork-backend-1.2.1.ebuild 902 SHA256 14dc3f0721c5ae5d0a1cecfdf9197159c9b46809f72dd84e66fe9042d8b8c91f SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43 WHIRLPOOL 7c9fca92cd5b5dcfb7f6e218c7674bc9e6b3077bf5f7a70b055274d2c5733516536f9df397026afa13e0e7f558ae2b00f72d3a495fb72ddbdd0e4e6a7db1d580
 EBUILD paperwork-backend-1.2.ebuild 902 SHA256 14dc3f0721c5ae5d0a1cecfdf9197159c9b46809f72dd84e66fe9042d8b8c91f SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43 WHIRLPOOL 7c9fca92cd5b5dcfb7f6e218c7674bc9e6b3077bf5f7a70b055274d2c5733516536f9df397026afa13e0e7f558ae2b00f72d3a495fb72ddbdd0e4e6a7db1d580
 MISC ChangeLog 967 SHA256 80c94264883f889f3144b34e4e4373588120b159ac8841f004384c953adf3982 SHA512 c4735f795f54cf2005eec720416013f0f562edbd73d73fb7123ecd456881504e68ba236411e7717d057baaf32a9d399daf0b349d1435c1a8a7025a35e015a0ad WHIRLPOOL adb9b70d3d44f2f0e3e89bb7f641c906816c1ccdb1c8c8fdad8a44cda19886f4e551a58fed4cb49c7c82f3294aac9a8260892d1c818747ec7862c8fc7a7f8703
 MISC metadata.xml 358 SHA256 1e8689d80462e15218f7106ada045210bcdc68a56c29df92226dcbbebd554d6b SHA512 1a5a81b753e23232ec0fa2e5239d80ae70a589403a1cec20191590f4d5741fe2519a389ecad905e4fd89d148f8420dc602016fe92f10fe03ebea70508d4d361d WHIRLPOOL e5f803d50bf121128bc23692478b57ad05b8b63b8ee801a7cea7d692596c6b30ec323353f606cc1dce479b26c696ee019ff0964f8283d726f878f2f538e1c2b7
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.1.ebuild
new file mode 100644
index 000000000000..da6daad02406
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 16770f7a3427..040eb2775031 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,6 +1,8 @@
 DIST paperwork-1.1.2.tar.gz 331028 SHA256 7beaf56fa91fb602d185256f3bbf3d9a85a332efd87d35dc22dbb9051bd94fa8 SHA512 14c018c9b148e1569948d2de7b1c0c04d353a7af7aa6a7102585665d9af2f5f2055145338a001085be0fc165abec066d73d3adc4a378a307326edf730c3c3606 WHIRLPOOL f951a15a9e2c14dbd08cd0b767c99dfa8ba63890d07ca135c347f141696652085494bc42f01d29015676a45fa4bc0f5785e4ec8a33cd5ab46bea48e21770d050
+DIST paperwork-1.2.1.tar.gz 8116070 SHA256 2b09a86e39125b455180cf17dd50d8b3d195b390bdcb02b9cf0836b0ee81de74 SHA512 fb44c048e8669cdc95a358369de418d862c49fe9a9d6cb8d20ce727ae0ca6a57c19cfd5f39fe95ee67c086dd481c22c3717a672f1ac09f3b63a0daa851a8e482 WHIRLPOOL a77265b3369b64045e9a252c6c05df7ee5a855e009a3999427605615845f6c96a9f87ed885c724dcc1d8d77fe8a5e5e0cf2b71208262d88f3822757425ec13ed
 DIST paperwork-1.2.tar.gz 8086428 SHA256 87f4610adfe0f79931d27d9a3c3b5441f77d9db64ed4f72ae2a1bf844df7eca5 SHA512 9c8c43ef31be2eef57ffbcdb00b4e91dd2b1eade75814b789c489abfb6f7bae07e68f7207c8fdef4f3bf95bd68bca8a680b965259106af9f0166bee7a6cf5ea0 WHIRLPOOL fa0e6acf4bd7514899433077a32222ced8fdf8565467dd7cb8cc05ab2c737352d67a8375af98bbed507ab5a73b302cd968dddce2bba8f13a3749edef8562f001
 EBUILD paperwork-1.1.2.ebuild 914 SHA256 749db520a98a8b7ec6dc7399bc91d1a9f1b737cbb0fba17535f0a69cf5b58beb SHA512 2529c16f7f10b9c0da68337485f53fd52b9b6d4236dad7939e98adcca4dff74fc648570d0a06ad2ecf0b8b1e6851f4671e89e64663287263232ebfa5b7fcbdc3 WHIRLPOOL b34c278abd306ae348b74c0fe87e6e6566a8f2b054581e6b50c6a3988863bccd47034aa8f303ea2eb6d52a14a7b1a079539b87f988ecd7564c3d22e4456502d6
+EBUILD paperwork-1.2.1.ebuild 926 SHA256 8d398a4d8e628c0593d9d20b24af907ab3d603f6a29cdae94e9a73fb912532ec SHA512 0e64099e88fce4e4050cc4d30a6917ba9981825801738c01187d46c2b39a10159d31ed7e9ce8ed0c5bcf4f38da0b00a993bdfc91e6d0be62586cdffcb9da9f5f WHIRLPOOL 0539a7c4296bede511893401d3641c04c3b0a57d703a65cc0c7b57d9a5f306a9e6b83d7853a50075a618023897c9f81578d080019a8aa1a793717f671613f66e
 EBUILD paperwork-1.2.ebuild 926 SHA256 8d398a4d8e628c0593d9d20b24af907ab3d603f6a29cdae94e9a73fb912532ec SHA512 0e64099e88fce4e4050cc4d30a6917ba9981825801738c01187d46c2b39a10159d31ed7e9ce8ed0c5bcf4f38da0b00a993bdfc91e6d0be62586cdffcb9da9f5f WHIRLPOOL 0539a7c4296bede511893401d3641c04c3b0a57d703a65cc0c7b57d9a5f306a9e6b83d7853a50075a618023897c9f81578d080019a8aa1a793717f671613f66e
 MISC ChangeLog 4353 SHA256 df1ae08ea32bbd7f7b5c52c1c6fbf98db9986a316c9d0ba46b8811ddf8387a1d SHA512 df83031a14f86971e99c70236ac3073a3a5e70ee31351ee7d79062a5103e5a7de35071c32a93849786689ddd555104288913123ed91c2d22707f0464452db48b WHIRLPOOL 22d287e2638eb4f9f095a7f8055b1706bc967819838f01d25e4094015d57c7af87f830054f0e9a8b717232be05a0d3768fc87d5779603e774b6642e8be839ed9
 MISC ChangeLog-2015 1818 SHA256 d80aa5257d448cbd7cea6e86469aa75f0ea1f22a1820b0067f449b6eff6e1682 SHA512 340d17f6b34cd14f49928a0e13b5320cab3837e74fda5a3e993c88aa03b2eef871db624ccb1ef1a912e3649d5aae230c433d8390ce4eaa6fe6f7a9a4f92c2132 WHIRLPOOL a067b717801cd166cb9ba00b79ec4f30b33d4e2a252f03a3343c290501efb1b53629b5991c257bd8fbeca41054ad5c4c4df29d2aea9e2c17db41700e0ce81450
diff --git a/app-text/paperwork/paperwork-1.2.1.ebuild b/app-text/paperwork/paperwork-1.2.1.ebuild
new file mode 100644
index 000000000000..1ce4f4dfe5d4
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork"
+SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinsane:2[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f2eb7f86686b..c88dfec59802 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -12,17 +12,21 @@ AUX poppler-0.59.0-qt5-dependencies.patch 944 SHA256 4fb00d04ca2df0eb6aa20f0704e
 AUX poppler-0.59.0-respect-cflags.patch 2749 SHA256 7cd2f99440c6dd29d2a1395d298e5d17b8c252209328e49cfabccf2287b4f1b4 SHA512 5078957d4b73a8f6bf1f9e4ccf46acabdb3b52cf58b3717dfda23518047648ad371e1aa60b371a72314a2171ec21ed4e0e2162c43876b512d8ca07eafda1702c WHIRLPOOL 78344be54fcfc37f517d0f2ddbe9471be4fc6773776cbb282ca79d669aa5ad9aec8353e78b431ae5e8d8eaaf0f3b22a025112142665aed0515d3ee5390c2a1df
 AUX poppler-0.60.1-qt5-dependencies.patch 934 SHA256 2230542bd9154b2905a2c3f274e55c9817502ceaa14f30a0cd57806137f5d887 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c WHIRLPOOL dd1ea8dac84c2aef744a412d37146dfd0a39952ab55ea1be5eaf608b49d82e366974335e5ca38ecb3236574e9081c9b189ca7581f26c236fbbcf352529cfd16f
 AUX poppler-0.60.1-respect-cflags.patch 2956 SHA256 0c32d963dd61af1a3c88f0f50268bc08b285638f08cb91df45a6a75452156e1c SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43 WHIRLPOOL b90741ed5ec1916f7b7be9a3a5420b103298a2310bd2866f6ed58fafcbce22cef60e692a1187eb56f2093ebf681108dabafd3125c164dd2f5b27af30ce9d8b43
+AUX poppler-0.61.0-qt5_pc_in_typo.patch 679 SHA256 2f5a30bde7962052cae2606fc454955e8e2f99711922d83ed019cd245baaa7c2 SHA512 44846890c66082b6d8ba2bb6a501f29a2a67d399aee4e83f87be62ec40d87f511dc193bf603022ffc387e34f057c5fb21dcabaa9a2d49026f97fb3cf5b03ee15 WHIRLPOOL 4710a91183f0909ac08a309c48ff90e80969e2d1a37b018543cc027269004c814bd7f5310c9611d100b952e6303113a4f457d8128b99a0c8697c73861b393583
+AUX poppler-0.61.0-respect-cflags.patch 3012 SHA256 4bc423b407b5f94764619c2011313970f06221b7fa48313c660235ce58dbcd92 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d WHIRLPOOL dc20cc06fbddf5085a1b429afc79dd53aebcdec54e6b0152b4e1722dad05692455b191edc9e6d0f4950de864385ac5d46ae60d4a787b4a79453691ff77c97df8
 DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
 DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000
 DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
+DIST poppler-0.61.0.tar.xz 1432952 SHA256 53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5 WHIRLPOOL 56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f
 EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
-EBUILD poppler-0.57.0.ebuild 3859 SHA256 5de3a27563f487f02d5afa311d8b5e3e06e28792bd3493a254f846804ad2625c SHA512 2ea74b06f47370358281b76ab2327b5ed09c1b63927d37317c2dbdc23492c53e2a110efd4833f1c0ab6a35948723c73b73be1f0574a4f455b7081e01e4950b01 WHIRLPOOL a93840b496b669a62e92f9bd982e37120f8e433251801e2335bc23320294b29c231a78f338185de992f2ec25b27fe73edd84bbbf86a71b22336a512d69daba44
+EBUILD poppler-0.57.0.ebuild 3858 SHA256 cfd1022b1f78c0249c5cc0ccd8603b73a8d60105ab0d386b2eb1927f3ea88390 SHA512 7ac898f6ae7e4535acd582966abf08ebad92d957257da548a0c330998d82a6f6e82b7e4990c6c333f2625f34b84ddc41a973af43e68da3d9d081c0243c3a21fe WHIRLPOOL b1753b898f43d012041040f312a7c50e066501456ec1fd5443a0c073ca79bff8643f0482bff346a4fe2c07103cf474945c7b7bd32d47c6c2ef541ee1616e08f1
 EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
 EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
 EBUILD poppler-0.60.1.ebuild 3861 SHA256 a1c0de6efb508cad5181ddf6fff049677198ec917c8d609b8cfe0ab8d554f651 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb WHIRLPOOL da25c7257a4538fbed96fc656fbae8cd1663ceacac243cb8b8974ccca625598349bcab3bf05583c57d0b01297cb12ece6128eef94d9e8cfe8ae10da6b8f71dcb
-EBUILD poppler-9999.ebuild 3875 SHA256 f3239dd95fc6202eb33521819752dca5d9f26802c4098521cb2cd0a6e329b44d SHA512 43de0b5e351cbdb94e52f9a18a5147f6e627f5552d34b6ffd9b4f1693118d0648ef2893ac50ca6147d716decb5afabfbd1b21afbe9add2116ee655bb40bff01c WHIRLPOOL c3efede6367e4de565bdbe5341132b900fb9e9fd8a7a6c7f0541de6119910b4627ec25221285becd87bce23e528baf543a5fdb7455d917761dcfc103887e8298
+EBUILD poppler-0.61.0-r1.ebuild 4081 SHA256 eeade23e885f0340539357eb085add9144ad7bde9287cb65af8d846bbdfcd128 SHA512 afb48ef236f68a5ea0f561819c77359bd9de1345a1bda970e17db79f6c9c6157d63b0b9f2fde0f48f76a9a7e1cc3c59c88090725408f63c6af3219de9ae339c1 WHIRLPOOL 2497c31550c03908fff87cd4e2c8574463f88cf738c66358d7f0ab6e1a39d0138bf82ec69d3332501466c515aec7d08eaeed305ff89a72f65a65d8979c6cbee6
+EBUILD poppler-9999.ebuild 3875 SHA256 8a4be7cd9f2377af8e68d4147d0e6909d592258cf9f80a9939e95711ae35d9cd SHA512 0605c6eef746d5851b21b4a9b6c7382bc3ddf3b0edc2725df608d34e00470dd92e7d7a79857915d4b990d2e8d11b37c2684b09ed8fa36ead918f6149b8473e59 WHIRLPOOL 2e8c4a10cfaabe911f63b5818060c0ffc64fc1da457cefe77f33a217f75b9a3722a4829fa86cbc28902ce85554532475b706031e58ae2d304c83a854b1e60ea5
 MISC ChangeLog 12583 SHA256 b10bb0674eaf3fb5709ac71f335e1d0b3010cc6465f52c43d0d9f8d80ba327f4 SHA512 92b92d9ca9d028de27ae96ac2de9f2f38b582742d0f6474315e341dc883488632a106232c4763375b93161885276cb4aa0c833712d96e569d2915881877611cf WHIRLPOOL fd51e52ac26587ade05a2548432a914936db4be111871ca8295930b47ee5e3064ad49cffc932ca6258191281b731f084b80186596e4d95d3fb63fc68587168ae
 MISC ChangeLog-2015 64326 SHA256 2d1c6158c2ddf8e667300324ead9d16a38118479df81bbfd17b754e19027b72f SHA512 beba273afefaaa7163bc58e177d7c52ac3e957037bf1616647021a174ea0cd86fc272c6cb8747b81e597e04ec2378591b37e4ca084f231c5ff20d4c9043fd961 WHIRLPOOL 9a7e71e81554411c48d7b6b60a7702c32c2a180f6dcbefc55777d9fb44f728250d08e08873dbc59653a90dc58da453e9d4789fc9a4fb8949d61971672bcf518c
 MISC metadata.xml 999 SHA256 ffe981c4c31df137ec6f6523138ab48e6d6bb60e84e8940e83211bc9415f05af SHA512 c23399b672d336acafa0e4589e44c66e57fcc71f4a4878f7f18672d9d02bae82e50f543c7462b1bb9ce3b08ee4f835997f1f571bbbb75bfbf820d9b31b60542b WHIRLPOOL a16ec5546bb6dc986e8100f316e91b738b1c97d85a0b0648901260792dd3acdd95b2f3271f46e77c0c6837285d5afdf7d65f80c3406cf9dca2d468e95082b19d
diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
new file mode 100644
index 000000000000..906989aa8ba0
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
@@ -0,0 +1,24 @@
+From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 7 Nov 2017 15:41:30 +0100
+Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ poppler-qt5.pc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
+index aaa1aa77..7e8c5c8f 100644
+--- a/poppler-qt5.pc.cmake
++++ b/poppler-qt5.pc.cmake
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: poppler-qt5
+-- 
+2.15.0
+
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
new file mode 100644
index 000000000000..a75b84b482f5
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
@@ -0,0 +1,55 @@
+--- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
++++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
+@@ -98,8 +98,6 @@
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
+   set(_warn "${_warn} -Wcast-align")
+@@ -124,39 +122,6 @@
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
+-
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
++ 
+\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/poppler-0.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
index 5af4d3454381..a4a64847c65f 100644
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.61.0-r1.ebuild b/app-text/poppler/poppler-0.61.0-r1.ebuild
new file mode 100644
index 000000000000..e1fa049c01c8
--- /dev/null
+++ b/app-text/poppler/poppler-0.61.0-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+	"${FILESDIR}/${PN}-0.61.0-qt5_pc_in_typo.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DCMAKE_INSTALL_DATADIR="/usr/share"
+		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include"
+		-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)"
+		-DCMAKE_INSTALL_MANDIR="/usr/share/man"
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 3194d05c38bc..664f5ee424ab 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/71"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -62,7 +62,7 @@ DOCS=(AUTHORS NEWS README README-XPDF)
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.60.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
 	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
 )
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index dfca52602b27..81d4e6502e45 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -5,7 +5,7 @@ DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabc
 EBUILD ps2pkm-1.5_p20120701.ebuild 811 SHA256 a9a38edf3da260c968d7159de6147560b0f7eaa8648c00f598ffd700538881f5 SHA512 0eacc17e678b0ed8d9ba77a5c8e0bc91fa134317cb5dc8393eb91d1ba5653668ec60bfd19a1f5bcf0cb9912f9a1428494c5d5244d9930d13d308a1c288d7c263 WHIRLPOOL de8756e4086391811d6eb51dcab15353bb9c29bfdf420fd4b8104764138b1d6a92c8116fe1fb9493d506c71dd0e2ce6e6b57c4ebc8bda385ac426338b0631320
 EBUILD ps2pkm-1.7_p20150521.ebuild 836 SHA256 b9f0c5401c6578b1d5e4e451c24c287e288726979297a6ca7a7fa79cba9239f8 SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24 WHIRLPOOL 5fbec21aced12e290b70bbc06019ede429dd9950ece912aa40c35489b4a90e99c6ac3261f061c21d7dd06613c4f6e85adf7b998eb87ccc8fc80f30487238175f
 EBUILD ps2pkm-1.8_p20160523.ebuild 848 SHA256 6b4ce0326314e8c45429b9de84500f6838209b22ea863230047ec56ebf22ed09 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659 WHIRLPOOL 443520383546248ca22d57d34c8813e19966170411020211eed40c1db9f22351adabad15b10f6cbbf929124e2150f55690875e06a7eababfa6b47910d33c0431
-EBUILD ps2pkm-1.8_p20170524.ebuild 851 SHA256 ebfdc8f881d8ac9ebfe9def9f75b2115acbdee0217869ddc84ed79b09837dbba SHA512 a0a25e472179a180c4c10078a20a3ba9f09dc4a431e5dc083f29f1fdcca74f26f347e1a75ea2ae09eef4ffecbe16d0c73a8b6a6ea78031579e7aabbc2b204d18 WHIRLPOOL ace3a3090038720e96e30aa6b4c5e875a496af44e9024ac722acb88306c81b80a8de878316a85c88621c4737637994323d43def1140f587996a15c9b45838398
+EBUILD ps2pkm-1.8_p20170524.ebuild 850 SHA256 d63fa320d437a9ad7e1358e189688b7aa7065443a020a839d82b37818877ce81 SHA512 c249652c7b2c74d8a8b7b8846a184a1457eb698eb4a131efc664aba3e0153f2ab409eb636b6f1fff487fd1cb0b247a1af30c860b10eac2f038d13e10b221fc40 WHIRLPOOL bbf73e790713e1794dc7e44f2f98afbb5ea63e5a657060af19a9ad240f1893a17b6a68dc1e17e0a294932f00b20935058789a5454ebbcc66b160cce2352c190e
 MISC ChangeLog 3214 SHA256 00bc72f2b1236be16f5b9e896234a7306a9e8cdf10bcd3ad5a178dac8192b45f SHA512 f0e8ad3f90f6fb1ae79239e9a41274df1ed35b6fe2c94e747120c6a6b0b4058ec1ab3419106cb7fc5b9afd5266da97b689469561507d1f253ffd6eddbd3d872b WHIRLPOOL 056d75722aa375c5ed3a5959c274b67d3c590d43f6ec92e35248434d098eed4ac4b476a4ed5a3c27b62eae9704f81e707f72bb2193fd569a5006bb4a28abfa00
 MISC ChangeLog-2015 5705 SHA256 396445523cb61727b5e7916f7484b2e980c24c9117249f6e4d27ee58d36feaf8 SHA512 345fad29bcc1ac94c07234d08c1c78dcb621d929f268b0554ac163e0c9360c5fb0fc8727e0946f826d8bf76aacaf20330bd936f6f22282e28d74e2bd95681d17 WHIRLPOOL a205ef93cf8701175e0cb7543cb51ee489b2ab4d9fad9c33e8462da456b175c4b2e3e098aa70a6884f5b42cf81f147a7ce4ea7ba2671313d380955491c5b3cca
 MISC metadata.xml 358 SHA256 ff0b9f8887c6df4e625e131a06e1612e53f7d09cb75a12ebe3a4a1fbced282a4 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818 WHIRLPOOL f8f5c4ccbb3bab42abda823707c2e968328aa3422b1ace474a584c170450e7c1e297c637d4a442613639d17e10c665f186d48dcedb37c8ab4e1b0a556257d8b0
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
index a928569c1271..ece8515878fb 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index d4bf6b8f0b6c..83cd7134b3dd 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,7 +1,9 @@
 DIST qpdfview-0.4.16.tar.gz 636095 SHA256 fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584 WHIRLPOOL 47bc82937562fdcbdf17f567bb0fa6e8eebd2e657320c129e9fd4f592c27eab855e7d2d69a22b45666509ace93b12528811b0671cb9483607448152bb676f11e
 DIST qpdfview-0.4.17beta1.tar.gz 658978 SHA256 60206c5f76410a35098e3c965552cec08cd85941776ea6f6b207d7ea63ce940f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a WHIRLPOOL 9ed967656b0e7e1f8828377d667d27a8c468f687b2df76285e1502cbdf0c5183bcec31bd8189ac80455395154e3df447eae1798b9581d05c7a8c24544b7d467b
+DIST qpdfview-0.4.18_pre.tar.gz 667869 SHA256 3e0fb7f16190d948ce5d094af7ff26c3e5e0e10bfdf01b4fe4bfa7b7cdda9602 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051 WHIRLPOOL 10d0b343e10a68f8b90cb777d08f5b7f9126d19bee41e82e7ae412c7903d8541b3484d3cac548322aeb85210fc5d5f07c5c84c9994094ff48384aec4635da2c9
 EBUILD qpdfview-0.4.16.ebuild 2136 SHA256 b9c8580d80cae221b0800e84c485a1510442c33353023bec42fbe8726a87b757 SHA512 17b67cceb5dd0a3ff56b53f1f7cd2a951c5dc7f3e91b88bf669f54c5258d084da76622e8eacbf5cbbbef8376250dc354f38ee7c5b71ded124ad13263af6e29d6 WHIRLPOOL c9f9e2776d563f40aee122466b7fa6ccf7ed2800cfdbaeb4fca230d91daddf8c66bdc3618f64ce9179b7ca25699775f96a742be93d239142635956c7da013637
 EBUILD qpdfview-0.4.17_beta1.ebuild 2169 SHA256 5a27a75d91333658235a8eafc4e91af68cbbeaa204f4d687a43bfed6a5d7e5d0 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24 WHIRLPOOL e1fceb7f92e8a2fdb45bb96b46f56b57e5a20cefda42a4e650f5d171898aef35beea66c50b7879aa5c7cf0e97bff60d89716b33dbb7d8711d79d1b44bd9397bf
+EBUILD qpdfview-0.4.18_pre.ebuild 2351 SHA256 54cdacaa43224b0443830a4ea9c1801e6c24749dc6c15ec039ecd3dba5372a5a SHA512 560b54fc310413fc34e24f441eb438db5221d211cb57fc318018e27b7913588e3361b056f4102cf922d6f79d955993ab40182158e6ce00ac5394bd82d98f56f0 WHIRLPOOL 39f928c54498b9d7870a25b464736b0d6f029f6e361d9c813350a124ae6557068e50490823ad09ead5cc5d1fab433cc7011958e14a9bf5b336d850257b0f0372
 MISC ChangeLog 4017 SHA256 758c62670b511d5f5e6bd98aa10d4632517f14709567f918c971d89eb2b14da6 SHA512 b53ebcf52c69fdeef2e8b443bd02979ca862c7be7594e2e0f153cb619e7ee81d1259024530aaf5ad31ff32d7019255ead1abe83c25cb00d9b7627b7057e238f5 WHIRLPOOL eb5c59537da43bef49904f7bc7eeffeb22db309fdd7b506771b3fa84a7b291a96d3f9d5f3b4fe8a3822f04dd0780e17b0da6ffacae0fa8097a9f6be76c207f82
 MISC ChangeLog-2015 11060 SHA256 4ebf33e2c1cd4f1eebdcf332d4e5726130ac5b7cb72be83d594ea4f3cedb650e SHA512 247ae9e9375993208b3cec76c61abb2f642e6c30b5e06176c5f32cc7db1a1c45f2e4e36da2809171090e602746544d659cec4773c4176fd9c6b98c0bdd760c7d WHIRLPOOL 8362376ff3aec029438936654d4d29f7ea668c0a9825c5b65460c02cba42f27cd134622ceeb8f38bb76bd15e9843a28e3775e816f4114a79e655fc4136764cce
 MISC metadata.xml 534 SHA256 f1dfee48e5bb767e4280f6285a400d697ac30f9f80ef43e1cb8a47be81b9a9e5 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133 WHIRLPOOL 00488c21cda0206d84de693e4264103ef0158e26a318b8b515a9a4a36f977d341686892dabe9657bc1accec2fbd17e747f03ffd65117859014a6e213fff65f3b
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild
new file mode 100644
index 000000000000..13bcc7b4241f
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
commit	a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree	e6d8d3589fcd01fbc3f1286185639163daa81424 /app-text
parent	fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)