gentoo resync : 30.09.2018

3 files changed, 5 insertions, 39 deletions

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]