From 53f6fcf851217ba7c20956c5b866a55a9bf9b82c Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Thu, 26 Nov 2020 02:58:02 -0500
Subject: [PATCH] media-plugins/gimp-resynthesizer: Update to work with
 gimp-python.

With updated dependencies, this utility can be installed using the
separated gimp-python package from gentoo-draconx repository.
---
 media-plugins/gimp-resynthesizer/Manifest     |  4 +-
 .../gimp-resynthesizer-2.0.3-r3.ebuild        | 34 ---------------
 .../gimp-resynthesizer-2.0.3-r4.ebuild        | 43 +++++++++++++++++++
 media-plugins/gimp-resynthesizer/metadata.xml |  8 ----
 4 files changed, 45 insertions(+), 44 deletions(-)
 delete mode 100644 media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r3.ebuild
 create mode 100644 media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild

diff --git a/media-plugins/gimp-resynthesizer/Manifest b/media-plugins/gimp-resynthesizer/Manifest
index 7cf6364..1e670dc 100644
--- a/media-plugins/gimp-resynthesizer/Manifest
+++ b/media-plugins/gimp-resynthesizer/Manifest
@@ -1,3 +1,3 @@
 DIST gimp-resynthesizer-2.0.3.tar.gz 11097693 BLAKE2B 51e064ed1a5d31dc3162a27b76c8b68d7652e3efdf2acad1844f4c76b47a6485b4e43788993c344a7154cddd8d2ac1ebda7c24f871ea8d6af332b1f15759f396 SHA512 de18fa41f5c3feaeff3365cc57b49f404f20439c6f84b212bc5cc76ee21f34566b8d093bebef1e6f27dbe3df6a23570dc091d23044a0967957ec0e97a16fa7c4
-EBUILD gimp-resynthesizer-2.0.3-r3.ebuild 713 BLAKE2B adb198ad0e6c68db0c6b85b8a1ee1e4f8abdabff3a90536d65fd33a1191ee4759c5158b9eb31e3056f5be1e24ef6194db360145f05212a952f8a2302ece3175a SHA512 b0178e42a34448da7833b0d489cca5d006046a08dc1390f1307099c3dd7257341926e93b2f199bf0f59c938402caa4f3069f3c6dc1a9b8685691a3f3d0f0ec33
-MISC metadata.xml 877 BLAKE2B 3e503fa59883ed68b3e57793430c0b3d88056a20548dd2de9498f96f0fb881700c93001df8162d63425ec21f817e27aa4c1c526219313818294b72862e133610 SHA512 cba06ed54fa07f78d5a114d679e978135acd13bff7eb69746e51c0f9f8ccc28c77b2692d1d1fb842aa695d7c01ce2e1cc096a362b385f7780fb60dd0c94f56fe
+EBUILD gimp-resynthesizer-2.0.3-r4.ebuild 1097 BLAKE2B 8484b92fe3cf86f6e8dfbbbe7b0e7c0d7a34c70b2c2f117d8cee6727dc408d5f57f4e4494657a61edfa600f6099d44c6b6482103190c599927d9a2d62c6d7206 SHA512 f343fbc71517858e554573d3666e8138a845039a48b274d00db996e946c7a11773da079c1de8cda2be34e20598fb5e5ab3f1a02c137f8ab8c58d92ebe4b46bd6
+MISC metadata.xml 651 BLAKE2B fce88379f37caa26affce3b55ab152952ab8ca7578b5f2cc19daf93228ec11211c32e278b194c2f9d55ed330c4de94abfdfdf0b99f2612bb85e1bf5187f431f9 SHA512 ee4c49df50d6e834d27093eaf2c6639749b625402003fd3a2575ad514a73cb0e71a3a0d8dbed807660ad0011a4fa6fac7c5d7e0899bcd137cc43749197f93501
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r3.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r3.ebuild
deleted file mode 100644
index fc63752..0000000
--- a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN#gimp-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Suite of GIMP plugins for texture synthesis"
-HOMEPAGE="https://github.com/bootchk/resynthesizer"
-SRC_URI="https://github.com/bootchk/resynthesizer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="media-gfx/gimp
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-RDEPEND="media-gfx/gimp[python(-),${PYTHON_SINGLE_USEDEP}]
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild
new file mode 100644
index 0000000..ca87768
--- /dev/null
+++ b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright © 2020 Nick Bowler
+#
+# License GPLv2+: GNU General Public License version 2 or any later version.
+# This is free software: you are free to change and redistribute it.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# This is a modified version of the original ebuild from Gentoo GNU/Linux,
+# covered by the following copyright and permission notice:
+#
+#   Copyright 1999-2020 Gentoo Authors
+#   Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+MY_PN=${PN#gimp-}
+MY_P=$MY_PN-$PV
+
+DESCRIPTION="Suite of GIMP plugins for texture synthesis"
+HOMEPAGE="https://github.com/bootchk/resynthesizer"
+SRC_URI="https://github.com/bootchk/$MY_PN/archive/v$PV.tar.gz -> $P.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="$PYTHON_DEPS
+	|| (
+		media-plugins/gimp-python[$PYTHON_SINGLE_USEDEP]
+		media-gfx/gimp[python(-),$PYTHON_SINGLE_USEDEP] )"
+RDEPEND=$DEPEND
+REQUIRED_USE=$PYTHON_REQUIRED_USE
+
+S=$WORKDIR/$MY_P
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-plugins/gimp-resynthesizer/metadata.xml b/media-plugins/gimp-resynthesizer/metadata.xml
index b6f08f6..9a606d4 100644
--- a/media-plugins/gimp-resynthesizer/metadata.xml
+++ b/media-plugins/gimp-resynthesizer/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		This is a suite of GIMP plugins known as the 'Resynthesizer'.
 		The most commonly used is 'Heal selection' but all use the plugin
-- 
2.43.0