gentoo resync : 30.09.2018

15 files changed, 67 insertions, 110 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 60c1b94d3c64..d61508e99541 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index a34d596ede0a..40b14895e23c 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -21,5 +21,5 @@ EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf08
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
 EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
-EBUILD docbook-sgml-dtd-4.5.ebuild 1015 BLAKE2B cb1a8ae6963b180b5b9a1a8d2a3307efa174fd56b52137bfc9a1a0546d98305fd202d49a8d74ef7a0a028370bde42c7133893db2f7d05184d81e6ec7cb397a56 SHA512 940f6d483b380ae709dc671d3615daa956a8923fde34493a4727b5997286271cc3a9f699d3afdca6071dfb0d3f3734446c3d205fbd6a1e8ef62c553adb2969e4
+EBUILD docbook-sgml-dtd-4.5.ebuild 1011 BLAKE2B 9c02058236f7b66de9aa762ed696e22c93e074f6647faf1dc37262f7d4ae5d02c0400cdaa015ce1560aae913b4db6e32a862305c56c7378a42d45f28085adfc8 SHA512 367701e984259dc600291eff305ec2274d947a24d18d96e4c198910850c5355a2056c3b151d9a31b27ee09d346f5245a9b35bdb26462276f82420ea4112b8b32
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index cd0eeec3be5a..d3912738df83 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index eecc1d39eb29..dd124695fe24 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -3,5 +3,5 @@ AUX libspectre-0.2.7-gs918.patch 1272 BLAKE2B 37f9b02992e622754c271d6c2d4921a3ee
 DIST libspectre-0.2.7.tar.gz 387947 BLAKE2B 1d8c5ce045e90cb10a159615d3b011dafd24fa07c8bbd79349663880d077b53944495cba7f5a77e8e32735123762d0f6fcd2feb382258b8d35107284f72243b8 SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
 EBUILD libspectre-0.2.7.ebuild 1232 BLAKE2B d77eb5e11d74f44972efd3a04252e44a8b0d37734957ad7ecad6f847be51a78f37cf0617f49a62c77211ea1d3b03216ef1a725832c698c06e9fe5bacd0f6a4dd SHA512 b3e700400305328d680e5e1a62aa696990cdff6ac55e3fe5079549ffb3c53e30559ff69b5d05090c6929d4511d2c13a28b82ba50ab0adcc412546da52b7b4992
-EBUILD libspectre-0.2.8.ebuild 1113 BLAKE2B e9871eff6710bca21e8d19332c9d0d494a55d13109ba306e15e320dad874a61516a32d62ede683d3adc6b4bc25ddeed72dc6528962d025bc4017d134a337574b SHA512 605ad231744d73a078ce1f4532dab61966117311796597b146906becdbc83a3ceaf2c388442e0f809fb4a662bb07cad29a4ede41af66442deee9b2489f73e61d
+EBUILD libspectre-0.2.8.ebuild 1110 BLAKE2B be9c0200beb1c2264280405dd80f28db2497e071a80bdeae45f8d5810dedcdf8d1db045ed19b15e033b10ae711c578c6562d03b979dd5747f3446503c3b9dee2 SHA512 add5c59d81def9ef31d881f19fff022d35727af1421dfcd94c4053a070e6e25aa91243e9685a6e8b1a2838aa77e9073f5079d95d70ba5d31d753d525306d06b8
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
index 18588796b3f4..feb3225fdc4a 100644
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index aea39d097e7f..0f94d927a761 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,5 +1,7 @@
 DIST master-pdf-editor-5.1.30_qt5.amd64.tar.gz 16150271 BLAKE2B dfbdacb6df75d268c57cc5d7f6c949c796abecd09394a80694dfc05b5e666c4e836f636b5af6a17a309625ed243e88c1871347e8f7162b6e3f8c47fc27d83e26 SHA512 3cc0a85e9518e75581cfdc05ac8dbdbd534fa11b4f4cfb490a0e9b411b84c073d52e9a5a3aa620507c88117cc04e033f5e860e335b37aef49eec95f2352e9b21
 DIST master-pdf-editor-5.1.36_qt5.amd64.tar.gz 16149439 BLAKE2B 882f399bfb5cf7b2a39c8174f541a1124953df5bc3bf5ded27bba1eec3ebc966e1b5c0174219759995d939ff203426a2004be61989fa7d062c26dc64320769b5 SHA512 934e9d856476e412a7b40858365e843a8350f638b48a9b593faeab12cd9032243042fd11929e826a294a29ab3810110c40fdd07f56e8c5d0fb6fa2f957a36c21
+DIST master-pdf-editor-5.1.42_qt5.amd64.tar.gz 16150053 BLAKE2B bd536d34621d79dae596127418b23495ea2daa2906668ee006ed2ba32e61d8cd71fa1471e90496e615ae67108cd90e072c01f6dbf53671d3f0d783421e63c06c SHA512 c1c53af9235a4f31cd108643fcafab9265de56ffe1a0949af1a39aaf0df8dec50cd8f5bd426fbd1750d6e59323628bd626c0acd7a788324c81b01e6793e0f5f3
 EBUILD master-pdf-editor-5.1.30.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
 EBUILD master-pdf-editor-5.1.36.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
+EBUILD master-pdf-editor-5.1.42.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.1.42.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.1.42.ebuild
new file mode 100644
index 000000000000..05c37155037b
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.1.42.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	>=media-gfx/sane-backends-1.0
+	>=dev-qt/qtsvg-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 61b121ce6e40..69f63abd40c1 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,7 +1,3 @@
-DIST paperwork-backend-1.2.2.tar.gz 64271 BLAKE2B 8261f64585d113a0a06a556e93c06cb528c60e1a906e2926aa55a39d363988ba9949ee7c51ab83efb683aa9beb986883e12e0895063e1a350a4ecdc23bb71cf6 SHA512 6fbf00f657134f1aeae0850f58adce0cef4dc292898db3fde725d404bea5d2fc73c386ce8c1f37ae7980997c23ba9489c13e02e3e9d056cca8014cf5691e5ef8
-DIST paperwork-backend-1.2.3.tar.gz 64676 BLAKE2B 9d6b43b7fea5a246e78d6cb250cbe94dc33dd0afea086933819d3392242c02c47789465e710313fd00b3e1731d936fa52d3086f00ba51a5c7cbaa4a9dfb2870a SHA512 1d79fa258c9e08d582797444257877e87bd8bb8413cea48419c6fea76d4b023b18fcb4d5831e09eca1561bea852e27f105841b04a44c319a0f9d7fc102c2c4d5
 DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
-EBUILD paperwork-backend-1.2.2.ebuild 902 BLAKE2B 94903cbe8f24b3a4fa40e110f41b898511b33e78790e768c00b1e170dfbf8393788ed15dc1076cb448178cea6e0ad7669584dad6bf98dfe036d2f1a8d90d91d0 SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43
-EBUILD paperwork-backend-1.2.3.ebuild 902 BLAKE2B e2cf019b547508a2810721634981f06e0a2e6fc6bd927e24a8d88cf9c0a886380a90252c7c89524c095259de7edc807c5a82ebdb33dbea8f1909d37e8acc268e SHA512 4bb4b41413b663425ffed140f57dd21764c06bb9a66befdb4eb3de0436307bdd29d83232f0fc188f9011b60dada4b7fb9f1c97d6548bf728bf6a57ca97e85f9c
 EBUILD paperwork-backend-1.2.4.ebuild 869 BLAKE2B c53a020afcbfc0219dabd1366998a279088f5e3e73ab15a970e2b7c136c55a2c11bb1e99806686eb3740eec5d8a8ae886bf5871efb5ead97a1278318616f6d11 SHA512 bfa7995265d8a05949628103a4e7d71f6a8882ca207803dbf3ff509b6f704c0175911731f8b020139f0253873129ea1060cc6f6df34d5340932b91928548009a
 MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.2.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.2.ebuild
deleted file mode 100644
index da6daad02406..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-backend/paperwork-backend-1.2.3.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.3.ebuild
deleted file mode 100644
index f0f34d215f9d..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 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 e33c180e887c..97a967c63d53 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,8 +1,5 @@
-DIST paperwork-1.2.2.tar.gz 8124352 BLAKE2B b88d03f0ab5f2512a2fb87a614c61458c3bb771b7803316feae526299e8823aaec73133a96e501f44d10f0c540c9697ddff32de557f060f289a2c7245d808b27 SHA512 e38d269e03f77bc3ffc75f9b77c960e69b8c3f67aac26a38f39b324118ecdcb5a293de8f50226da07f913f3c849b7602b3250304bc348fb2f6d6816d09b17257
-DIST paperwork-1.2.3.tar.gz 8120802 BLAKE2B 8af1b9ff1f7049b0be04186a9b658804283cffcd94aa795e53fbce92e54abef8f6e63416aebbb3fdd54fd462c4ab057214283b4267a42d5cabc33cd2b84f0d2f SHA512 95e0909253e942917825b3475f5c8a0ea81dfc311c90f17f9141326ef58e82e4bcbb8235223cc2ce15bf491895de93810caaacc90cc7bcbe8a65aeafdf1eb9f9
 DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
-EBUILD paperwork-1.2.2.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
-EBUILD paperwork-1.2.3.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
 EBUILD paperwork-1.2.4-r1.ebuild 927 BLAKE2B 1fdda901f0fcb17bbe56baae0dc5474bc55967257dfb30ac39ff479e4f5de120d1ed8194894097f31b104df98945772612b50d3cdfdbc6f823bef5517cf09d98 SHA512 2db92699b349fc02438f612c17e00d6daf9e03e2d02a36fcedaca0ec2f41ca860e64a52283131fbf0cc23579b4286eeeff7ba1137b75f628a8c7a8aea82d7d7e
+EBUILD paperwork-1.2.4-r2.ebuild 970 BLAKE2B 309c4655686743c4188ce38c3dfb68fb60d4f83fd30757a34f85ac13fee303513ab044147a099078c0ee60129d9032f3c6890443ee91a3e8f9c7e82f0da6dc9f SHA512 38f548e898c97078ee57fab77137498074a4dfeefec72b43a5bcf862b9328e0b641ea742739cfb485799475dc940046c32b3485bce46adec7084fe79b837496c
 EBUILD paperwork-1.2.4.ebuild 964 BLAKE2B 3bc143a98fdf0962e620d97fa129d73a8a9207536961532b394c1a31fdb0c29c42e4a1b7ea99a325bb8ecdb6fdfcd92874e54aa8813c78054280f09495f2d77d SHA512 d93c4389df13158f99780d085211c9e18fde0f57ee9ee54c94c87f79537ecf1f907016546b4023e1395f4a9851ba431252f4d7068c32442d105950963ee2fe33
 MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/paperwork-1.2.3.ebuild b/app-text/paperwork/paperwork-1.2.3.ebuild
deleted file mode 100644
index ca20baeb28fe..000000000000
--- a/app-text/paperwork/paperwork-1.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 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/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.2.ebuild b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
index ca20baeb28fe..9e4ef25a5076 100644
--- a/app-text/paperwork/paperwork-1.2.2.ebuild
+++ b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ 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"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,11 +19,11 @@ 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/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/simplebayes[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c177c58656ce..54f7a003579b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -12,5 +12,5 @@ EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0
 EBUILD poppler-0.65.0.ebuild 3517 BLAKE2B b50f15e427e79492d6101dbc6b71704236d1330e27a5e756d0637ddfee2d0f955b1147c1525624820be7faee3a0dc09f006f1fc533e7aebd4b5f7229b09ab34c SHA512 51c8e5db741b927c8ac68618f58cf306571185d33166cc87b615bbcb852590527cc0d06f1e1c86e65026bf9d7536a0949e9118d5729f63d2f4815a1e37badc8f
 EBUILD poppler-0.66.0.ebuild 3546 BLAKE2B 06b268276b36fb0b8c91293f51e31b0840234958eb40e0505f9b944df08cc515222e5151fe0a5d63fea992ddec08dddacdf5b598ff01e46b97416c8de087aefc SHA512 e0c5f8985df997aedac113ea75404616bf29979377bb58b9381a25faa47cc1718d0261a3f222a5d492a7e0ff1c5911e38b2f3aabce12e19686e584042a146086
 EBUILD poppler-0.67.0.ebuild 3546 BLAKE2B 21bdd13402e3e4718e032f4c6cc3b57e45e9585b58c34644cfb2687b3c8b1dc9a7d5b1fbeafebee6ed7482065405fc47a7761c175936b06a7a8300cd71fae8e7 SHA512 0a24b3f91462036754bf6efc161fc55fcba27388ff9e16a84bcb07e06f73aa5521b486f2df555232e8c1b00be8f7bf1ae3cc2578df8f988d18fde18e54086896
-EBUILD poppler-9999.ebuild 3546 BLAKE2B 21bdd13402e3e4718e032f4c6cc3b57e45e9585b58c34644cfb2687b3c8b1dc9a7d5b1fbeafebee6ed7482065405fc47a7761c175936b06a7a8300cd71fae8e7 SHA512 0a24b3f91462036754bf6efc161fc55fcba27388ff9e16a84bcb07e06f73aa5521b486f2df555232e8c1b00be8f7bf1ae3cc2578df8f988d18fde18e54086896
+EBUILD poppler-9999.ebuild 3544 BLAKE2B 98a9bf29b703af3ce264001e5163ecb6640b46624e88fb7647288a358a9cb5c89450b1cc01ed9ba49a8c1fedf7f2b0581afba20af30acfc3c5c6cb761536e006 SHA512 d1117fed1c2ab2e9d1a2f6e5d0e9a214b9f9903672b2ceebe5907d7b5d9a7e0ef9d8018a855a755e2cdc0d3fbfaef7f7cb544cef7f1cc6ba651d6a672b519394
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 89a289be0ed4..bdb46ab59767 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/78"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/80"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -59,7 +59,7 @@ 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.62.0-openjpeg2.patch"
+	#"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )