gentoo Easter resync : 12.04.2020

7 files changed, 21 insertions, 188 deletions

diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 77ec2c08c730..bb732e5e9d55 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -1,8 +1,3 @@
-AUX cropgui-0.2-PIL.patch 831 BLAKE2B 936d4de690a45d9213f7337c1f2adc72dc39b370a9327bcb23f8d527c02397bb01e8ffe581eed734e4b99e2827c713e97e11bd6449623dade81ead6f4a3ce028 SHA512 b2b4be9f04c26906f998d5c693722d58e2d40270dcf41cb6027206adbbfeed0133858be7fbd44f846a83b23cd4da3f286fbb188b2547103a7320bcee0b35fa15
-AUX cropgui-0.2-tobytes.patch 1590 BLAKE2B e83066d2c80d4351d557d91e4d662515419b68579e07834d95da66a12b20bb891b913224c54bb6d4befba4a5a1c86989fbb0392d0e5e53fffaae1ada82ae3947 SHA512 2824a75de26eb200f991c759235a9da9ba5a61bc5f315e679920f1481b6826230432d91f2b710882463c8d8fb5856d001aa9d209de2a6d31fa027683cd57cd75
-DIST cropgui-0.2.tar.gz 842734 BLAKE2B 4a09fef84634cc07d81580f9652826dd4e388c27d9db33fb63e8f7c9ac2341cb532b81894fcab624df2495865af6f6580b03c871ed7d138bf5c7d2fc02386a7b SHA512 d6a9feea8c5de57455d0f7247465108d5a931f773f4df0c91629400bcc2c958c76559a84b6cde45709bcc8936ff7f5e2b3553897a14fbec14a9f032065ce83ba
-DIST cropgui-0.3.tar.gz 851911 BLAKE2B 57e8a013f1d0e9741e40657fcdd15c029a9cfd193d212389c4a98eb4520c64d7cb8d7d3adca9c727c2a7415ca8eaec8c7b3e621088e2d55747e60a1ab65306dd SHA512 ec8c15d25dd0eac1979a7cc20806cbf412cac9e5279538db0bf27a7c0ec98fc272650bb9f3d798408a96b6c49cd733e3df035f74b3bc6ef79d853c1a47a944ff
-EBUILD cropgui-0.2-r1.ebuild 1327 BLAKE2B 471d9ef156085cf203a0656800760837adf15d7c4d73108460d7a2a664bc1d44ddca22e4a6f4f8ee582e83257554c46e078ddea73d0f9b85a5377608296e5514 SHA512 1391e50029f995d1cddbeddc4c849b806ab0429ecabc50b0f14b953db4a2066a557bc3bbf990907e2400adaea0504fde28d49055e3349cfb626f1ed59bf2bff3
-EBUILD cropgui-0.3.ebuild 1223 BLAKE2B d2a9a6eb165789c1c74f263f6ecb3e211b154489f84f275afda80575375b8b7e52b4e5b07ed899ec90c1765dd348d161b36bf0363fefd054527885aa47ad77dd SHA512 0534383658a587adc17b4c4a517184fe80c21e38ec62f707a40c66075ab68a64ed08fc52e42f9aa15fbdc55dc4ff92387bfc7d3886d460ae0661901c93e9da01
-EBUILD cropgui-9999.ebuild 994 BLAKE2B 03eb7a7f4080709efa0789df9b4f2705b3765ec5859fdd2a79e8c2ad851a6c85b3df8a144720ac3654f60cace962a8bfebcb56366a2c7e9aaf00c51fcfdd4ea0 SHA512 7805c24d280653e05be9cafd97e8f3fc9d9a70538ad9efe473143667fa8ffee080cbd2139e1e5c8155ad4ddc2abc8f2e5ffa98efff3e4f512d29252cc7ae30aa
-MISC metadata.xml 326 BLAKE2B 9de42c9e878245c3e69bb73156b0f3531b2ef232d041d600c47ada3ff614354e37bfdf5ff6d1d11b872ebc73dcd729404ab4fb8caaa845e3cd571e636d0f8efe SHA512 7fa6076e0d39f2c2b5a7290ec75af076fbe2b0f4040861d5c2b428520e9e84447210245a6e66dea2742ddeeaf1534741e4b3dc1f18a411db4f3657fc3ee971a0
+DIST cropgui-0.4.1.tar.gz 852958 BLAKE2B dcc6ba775e49af9a9fe1054fe5246e87e044f47cb7ca20712e5048dd1fa0fda35ee90c38cf733540913d0220eb58ab0a6dcfe93c7b02ebb9e022529b8add6c1c SHA512 85b0c2c57faecdd7db15e417234f2ea50fc5edbdcacaedcfc53cda68c3a070f4ba0201bff9afbaa3de7c51552309df1ac3e87586b4021e68bbb255a2545d92da
+EBUILD cropgui-0.4.1.ebuild 1098 BLAKE2B c70f86c3cc622e43bcea65dbb18bde644191cbc4b5ab3e21c66442726cdb581e9dec2e4839ab4f488915aff4cca249b207346a9edb20e986283b1fd1f14a5546 SHA512 969f1d799d14b182c82660a8fae072a09e07efc85798ac125da18eef9d4e6abe0ce161f6d08b5a9d9fc95acda7973838c7aaf6e51792d6629d0422e01ca21760
+MISC metadata.xml 322 BLAKE2B 90aa45b1eb0991ece5ae99458d976775a725221c0a472dc7f7667ad8b72c322f549aa33099669d5122807d5965348950edfd2c0bfa811435d11149e4577a230c SHA512 05b261ca819100fadde1548385d1632b157bfe6ddf1c7a876703f51d04a8aaa68f2d0aa18b188878c07fa27ed54cd65ec5ec4c4c042788fbbb525271ccda07e3
diff --git a/media-gfx/cropgui/cropgui-0.2-r1.ebuild b/media-gfx/cropgui/cropgui-0.2-r1.ebuild
deleted file mode 100644
index 4843bea19214..000000000000
--- a/media-gfx/cropgui/cropgui-0.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1
-
-DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i  -e '/Encoding/d' \
-		-e '/Version/d' \
-		-e '/MimeType/s/$/&;/' \
-		-e '/Categories/s/Application;//' \
-		cropgui.desktop || die 'sed on cropgui.desktop failed'
-	# bug 471530
-	eapply "${FILESDIR}/${P}-PIL.patch"
-	# bug 616708
-	eapply "${FILESDIR}/${P}-tobytes.patch"
-
-	eapply_user
-}
-
-install_cropgui_wrapper() {
-	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
-	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
-	python_newexe "${ED%/}/usr/bin/${PN}.tmp" "${PN}"
-	rm "${ED%/}/usr/bin/${PN}.tmp" || die
-}
-
-src_install() {
-	python_moduleinto "${PN}"
-	python_foreach_impl install_cropgui_wrapper
-
-	domenu "${PN}.desktop"
-	doicon "${PN}.png"
-}
diff --git a/media-gfx/cropgui/cropgui-0.3.ebuild b/media-gfx/cropgui/cropgui-0.4.1.ebuild
index e55631898440..867b72d6161a 100644
--- a/media-gfx/cropgui/cropgui-0.3.ebuild
+++ b/media-gfx/cropgui/cropgui-0.4.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit eutils python-r1 desktop xdg-utils
 
 DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
+HOMEPAGE="https://emergent.unpythonic.net/01248401946"
 SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -19,25 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i  -e '/Encoding/d' \
-		-e '/Version/d' \
-		-e '/MimeType/s/$/&;/' \
-		-e '/Categories/s/Application;//' \
-		cropgui.desktop || die 'sed on cropgui.desktop failed'
-
-	eapply_user
-}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
 
 install_cropgui_wrapper() {
 	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
 	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
-	python_newexe "${ED%/}/usr/bin/${PN}.tmp" "${PN}"
-	rm "${ED%/}/usr/bin/${PN}.tmp" || die
+	python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}"
+	rm "${ED}/usr/bin/${PN}.tmp" || die
 }
 
 src_install() {
@@ -47,3 +35,11 @@ src_install() {
 	domenu "${PN}.desktop"
 	doicon "${PN}.png"
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/cropgui/cropgui-9999.ebuild b/media-gfx/cropgui/cropgui-9999.ebuild
deleted file mode 100644
index 1d83737474c9..000000000000
--- a/media-gfx/cropgui/cropgui-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/jepler/cropgui.git"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils git-r3 python-r1
-
-DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-
-install_cropgui_wrapper() {
-	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
-	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
-	python_newexe "${ED%/}/usr/bin/${PN}.tmp" "${PN}"
-	rm "${ED%/}/usr/bin/${PN}.tmp" || die
-}
-
-src_install() {
-	python_moduleinto "${PN}"
-	python_foreach_impl install_cropgui_wrapper
-
-	domenu "${PN}.desktop"
-	doicon "${PN}.png"
-}
diff --git a/media-gfx/cropgui/files/cropgui-0.2-PIL.patch b/media-gfx/cropgui/files/cropgui-0.2-PIL.patch
deleted file mode 100644
index 3c1e91847f8e..000000000000
--- a/media-gfx/cropgui/files/cropgui-0.2-PIL.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- cropgui.orig/cropgui_common.py	2016-01-28 12:54:47.424636620 +0300
-+++ cropgui/cropgui_common.py	2016-01-28 12:55:15.176635735 +0300
-@@ -13,9 +13,9 @@
- #    You should have received a copy of the GNU General Public License
- #    along with this program; if not, write to the Free Software
- #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--import Image
--import ImageFilter
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageFilter
-+from PIL import ImageDraw
- import subprocess
- import threading
- import Queue
---- cropgui.orig/filechooser.py	2016-01-28 12:55:26.505635374 +0300
-+++ cropgui/filechooser.py	2016-01-28 12:55:32.649635178 +0300
-@@ -8,7 +8,7 @@
- import gobject
- 
- import os
--import Image
-+from PIL import Image
- import cropgui_common
- 
- def apply_rotation(rotation, image):
diff --git a/media-gfx/cropgui/files/cropgui-0.2-tobytes.patch b/media-gfx/cropgui/files/cropgui-0.2-tobytes.patch
deleted file mode 100644
index 18405143badf..000000000000
--- a/media-gfx/cropgui/files/cropgui-0.2-tobytes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit b664d1fefd7140ec4ec37b3b90a9007839029d8a
-Author: Tristan Stenner <ttstenner@gmail.com>
-Date:   Fri Oct 9 08:40:04 2015 +0200
-
-    Try tostring(), fall back to tobytes()
-
-diff --git a/cropgtk.py b/cropgtk.py
-index c1156b0..135b6a8 100755
---- a/cropgtk.py
-+++ b/cropgtk.py
-@@ -170,7 +170,11 @@ class DragManager(DragManagerBase):
-             rendered = self.rendered()
-             rendered = rendered.convert('RGB')
-             i.set_size_request(*rendered.size)
--            pixbuf = gtk.gdk.pixbuf_new_from_data(rendered.tostring(),
-+            try:
-+                image_data = rendered.tostring()
-+            except:
-+                image_data = rendered.tobytes()
-+            pixbuf = gtk.gdk.pixbuf_new_from_data(image_data,
-                 gtk.gdk.COLORSPACE_RGB, 0, 8,
-                 rendered.size[0], rendered.size[1], 3*rendered.size[0])
- 
-diff --git a/filechooser.py b/filechooser.py
-index f2f8122..a039d74 100644
---- a/filechooser.py
-+++ b/filechooser.py
-@@ -49,7 +49,11 @@ def update_preview_cb(file_chooser, preview):
-             i.thumbnail((PREVIEW_SIZE, PREVIEW_SIZE), Image.ANTIALIAS)
-             i = i.convert('RGB')
-             i = apply_rotation(r, i)
--            pixbuf = gtk.gdk.pixbuf_new_from_data(i.tostring(), 
-+            try:
-+                image_data = i.tostring()
-+            except:
-+                image_data = i.tobytes()
-+            pixbuf = gtk.gdk.pixbuf_new_from_data(image_data, 
-                 gtk.gdk.COLORSPACE_RGB, 0, 8, i.size[0], i.size[1],
-                 i.size[0]*3)
-             preview.set_from_pixbuf(pixbuf)
diff --git a/media-gfx/cropgui/metadata.xml b/media-gfx/cropgui/metadata.xml
index 0f64e749a72a..27aa4f80ba4c 100644
--- a/media-gfx/cropgui/metadata.xml
+++ b/media-gfx/cropgui/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
+		<email>hanno@gentoo.org</email>
+		<name>Hanno Böck</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">jepler/cropgui</remote-id>