gimp-python et al: Avoid python-exec dependency.

Since python-exec dropped python2 support this package cannot be
installed anymore.  But this is not needed so just swap $PYTHON_DEPS
out for a direct python-2 dependency.

diff --git a/media-plugins/gimp-plugin-export-layers/Manifest b/media-plugins/gimp-plugin-export-layers/Manifest
index 95ddaa5dad9c8809fd2a7b10c66773b984068e5f..f00496d58d8e1b23724961bd11e5ad2ade143ed5 100644 (file)
--- a/media-plugins/gimp-plugin-export-layers/Manifest
+++ b/media-plugins/gimp-plugin-export-layers/Manifest
@@ -1,2 +1,2 @@
 DIST gimp-plugin-export-layers-3.3.1.tar.gz 1023297 BLAKE2B c6a26b381bdfe450b1a6cd0491fcc1f471ee1c2cd204cf43cb7c993bd62311a1d32e977b917fa020732ac92a6eab371d5574eb9c13b7c505022971b736b531ff SHA512 92b8798f9129624e4a5ce5fc8b1e9106eb1e0614b50074450c69f17d33646f3b9bfda231d8de7f79d16037194f94d5584b0e3b98ebac1c2aa98f94ae7f66ef8e
-EBUILD gimp-plugin-export-layers-3.3.1-r2.ebuild 966 BLAKE2B cd2e221256f992bfb708e0520993bc21ece8fab9f0129ce3643acf4410ae3ce4049feddb1fb05e83f58d8f3bb9fcceab5881074e2f565c3e24f1ad8cdc606a91 SHA512 f05766497389061d3fc1b5f96420a939bfbc7db519391af1271d756350997b74d4254253062287870e71db19afcaeb634e2d1624150d41a32dbded13ed96d16d
+EBUILD gimp-plugin-export-layers-3.3.1-r3.ebuild 947 BLAKE2B cc7a97930f734907e75a74e4f6f4a12c29dbdcf31d809c4372cab7ee11faa9bd4490395e1c192c26c9775943045355ac97496302f9efa70973e9caefbf5f0abe SHA512 eb5cdeeaf6fb74e0b9fc6e7978bec7b2ce85c131267c991f67ebd4a5d9f0451a7a674f264e17994408d8a8db956be7bf5a5bb74057ed6c3e95e4d89a6ada507f

diff --git a/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r2.ebuild b/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r3.ebuild
similarity index 92%
rename from media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r2.ebuild
rename to media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r3.ebuild
index 8a1403e70b6ae933b6b95c1e67414c5f16aa07b1..64282d25070caeec3f2605ddaa016d7b2bb4f19b 100644 (file)
--- a/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r2.ebuild
+++ b/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r3.ebuild
@@ -1,5 +1,4 @@
 # Copyright © 2020-2021 Nick Bowler
-#
 # License GPLv3+: GNU General Public License version 3 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.
@@ -9,7 +8,7 @@ EAPI=7
 _PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-single-r1 multilib
+inherit python-single-r1
 
 DESCRIPTION="GIMP plug-in that exports layers as separate images"
 HOMEPAGE="https://khalim19.github.io/gimp-plugin-export-layers/"
@@ -20,8 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE=$PYTHON_REQUIRED_USE
 
-DEPEND=$PYTHON_DEPS
-RDEPEND="$DEPEND
+RDEPEND="dev-lang/python:2.7
        || (
                media-plugins/gimp-python[$PYTHON_SINGLE_USEDEP]
                media-gfx/gimp[python(-),$PYTHON_SINGLE_USEDEP] )"

diff --git a/media-plugins/gimp-python/Manifest b/media-plugins/gimp-python/Manifest
index 757f975731fdffea907a7b9705d8e79877332807..cb7cf37b287addda6572aa0f69a427a62d0db5f2 100644 (file)
--- a/media-plugins/gimp-python/Manifest
+++ b/media-plugins/gimp-python/Manifest
@@ -1,3 +1,3 @@
 AUX 2.10.20-no-mypaint-brushes.patch 685 BLAKE2B 21e363293c7890fab497dfb3a46ad814242629df993f3f049a63a988089def276d4c182cdcc43ab2269ca84116e296d8905b5ac4aac9ad5511acf7b60ce25177 SHA512 e09679929dff867fba54af98fd5d03bc9421f44facf861c900e4ecaed9eb093f79924f530a2b10733837ab2a6d0fe8e3d5b5aa296884a7edbe2e526ccb6196d9
 DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
-EBUILD gimp-python-2.10.20-r1.ebuild 1469 BLAKE2B 4ea932652db268cc70fff6375e7758023760281d1267cd3145d9bffad495c72bea14d46b2d00a149631003e74ba8b779f25e937a96b6ecaee1283335d0854795 SHA512 5ab5f59b71898f1a3f9bd2a3c857025693d26e244e720181768752f2c2a47592acd993c5faea94caa4a2096c8a01eedbc48a3f5af97471c7cef07f6aac279574
+EBUILD gimp-python-2.10.20-r2.ebuild 1476 BLAKE2B 0db3d9bf5e4a6cca17fc4675a042fbf8c500e3dfc34c004f99144d30e967a96c64d4a82f43b1fa017154606b8917060f9c01a33dc9b68ecb4c809758c3ea1a8c SHA512 0ea50f2b0549cad03f4d97a5e8732a121eaec0bc430fcdc9ff915647e7f1215c4ef89617047b02365639b106f159f364307119163827a5406a02fd2027e7a9db

diff --git a/media-plugins/gimp-python/gimp-python-2.10.20-r1.ebuild b/media-plugins/gimp-python/gimp-python-2.10.20-r2.ebuild
similarity index 98%
rename from media-plugins/gimp-python/gimp-python-2.10.20-r1.ebuild
rename to media-plugins/gimp-python/gimp-python-2.10.20-r2.ebuild
index 300c7863f2cf387cb1774e23a45e7cefdfc56dc1..479a89735402e7088d7eef5eabf58cceaba7025d 100644 (file)
--- a/media-plugins/gimp-python/gimp-python-2.10.20-r1.ebuild
+++ b/media-plugins/gimp-python/gimp-python-2.10.20-r2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
-DEPEND="$PYTHON_DEPS
+DEPEND="dev-lang/python:2.7
        >=media-gfx/gimp-$PV
        $(python_gen_cond_dep '
                >=dev-python/pycairo-1.0.2:2[${PYTHON_USEDEP}]