media-plugins/gimp-python: Remove python eclass usage.

All the python2 support is now totally gone from the eclasses.  It does
not seem particularly problematic to just open-code the necessary
commands in the ebuilds.

diff --git a/media-plugins/gimp-plugin-export-layers/Manifest b/media-plugins/gimp-plugin-export-layers/Manifest
index f00496d58d8e1b23724961bd11e5ad2ade143ed5..defa1a966c58190f58b47c576a62e08920ef6e0d 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-r3.ebuild 947 BLAKE2B cc7a97930f734907e75a74e4f6f4a12c29dbdcf31d809c4372cab7ee11faa9bd4490395e1c192c26c9775943045355ac97496302f9efa70973e9caefbf5f0abe SHA512 eb5cdeeaf6fb74e0b9fc6e7978bec7b2ce85c131267c991f67ebd4a5d9f0451a7a674f264e17994408d8a8db956be7bf5a5bb74057ed6c3e95e4d89a6ada507f
+EBUILD gimp-plugin-export-layers-3.3.1-r4.ebuild 975 BLAKE2B 9b0a59328013c2764dcd53a6c5acb4eb35c577ddd0b210b4e876a9aeb13248f325fef74e8324b8226a86df24dc3f8690a026f7e04694db4f85ede8995c37e8f1 SHA512 400568b65a6253e6e06d1949dc6ec61b8a527666f661add06edc00722e3f2427523502794ac56d885e30a29e19069e301ed74429e41f146dbe528e1334a33b72

diff --git a/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r3.ebuild b/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r4.ebuild
similarity index 65%
rename from media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r3.ebuild
rename to media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r4.ebuild
index 64282d25070caeec3f2605ddaa016d7b2bb4f19b..439e72f9075c4325b98de5b0fbc1334b2e68e314 100644 (file)
--- a/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r3.ebuild
+++ b/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r4.ebuild
@@ -1,15 +1,10 @@
-# Copyright © 2020-2021 Nick Bowler
+# Copyright © 2020-2022 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.
 
 EAPI=7
 
-_PYTHON_ALLOW_PY27=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
 DESCRIPTION="GIMP plug-in that exports layers as separate images"
 HOMEPAGE="https://khalim19.github.io/gimp-plugin-export-layers/"
 SRC_URI="https://github.com/khalim19/$PN/archive/$PV.tar.gz -> $P.tar.gz"
@@ -17,19 +12,26 @@ SRC_URI="https://github.com/khalim19/$PN/archive/$PV.tar.gz -> $P.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-REQUIRED_USE=$PYTHON_REQUIRED_USE
 
 RDEPEND="dev-lang/python:2.7
        || (
-               media-plugins/gimp-python[$PYTHON_SINGLE_USEDEP]
-               media-gfx/gimp[python(-),$PYTHON_SINGLE_USEDEP] )"
+               media-plugins/gimp-python[python_targets_python2_7(+)]
+               media-gfx/gimp[python(-)] )"
+BDEPEND="dev-lang/python:2.7"
 
 src_install () {
        local plugindir=/usr/$(get_libdir)/gimp/2.0/plug-ins
+
        default
 
-       python_moduleinto "$plugindir"
-       python_domodule export_layers
+       insinto "$plugindir"
+       doins -r export_layers
+
+       local args=(
+               -m compileall -q -f -d "${EPREFIX%/}$plugindir" "${ED%/}$plugindir"
+       )
+       python2.7 "${args[@]}"
+       python2.7 -OO "${args[@]}"
 
        exeinto "$plugindir"
        doexe export_layers.py

diff --git a/media-plugins/gimp-python/Manifest b/media-plugins/gimp-python/Manifest
index 1898069fbb8ae30c5a099f9c6ae9c1b03360c727..79af8915c77f257e0b620c15f5cb84cbeb4e1465 100644 (file)
--- a/media-plugins/gimp-python/Manifest
+++ b/media-plugins/gimp-python/Manifest
@@ -1,4 +1,4 @@
 AUX 2.10.20-configure-fixes.patch 937 BLAKE2B 521561034962b72982d609fe7f0151f8dcefde8cbf324ede25fe59e230e86281100be1c2a9bcbada3b1209210483fe3861abde4e2f2cab7d0a9e83ae17a244d0 SHA512 00308227e386029fb58786d461edbdf0ad711d27d11559ac90213e15a3842243ed101f12e120f15f32afcb6ab02e730927b50b8528db30d46b3f64087ce6667e
 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-r3.ebuild 1518 BLAKE2B 7714ee33b003c31876487f19fbb012f772bdbf56b1ec079eea90754adde413acd20ce1ffde299c85f11da436bbc25ec5f04f1f2638f3bce55873acc1eb4043dd SHA512 6929273d445a97e9509224863525d372d002d7e29821e242428f0298d1e10df7e03eacd8099b29522ac31900b688070c8037eef19b7ec0d647da4f2ae81da3cc
+DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
+EBUILD gimp-python-2.10.32.ebuild 1394 BLAKE2B b8da2fbdb67184be47910d63bfc1d8e0795df3b61c2316f4702ae972b2467c301ed3ec916d48ccc3304933dc612f9bc253c5bce8d493321af4e163e360934dec SHA512 1e6df3293ed0df410fab788cf1ad3f6a4b8b896994bdef1af4586b2e354f75ec4c5a038711d4c2bcbaeffad8d726d79de50d06c40d2212641571c36a70f851a2

diff --git a/media-plugins/gimp-python/gimp-python-2.10.20-r3.ebuild b/media-plugins/gimp-python/gimp-python-2.10.32.ebuild
similarity index 75%
rename from media-plugins/gimp-python/gimp-python-2.10.20-r3.ebuild
rename to media-plugins/gimp-python/gimp-python-2.10.32.ebuild
index 099a47653039d4695c3a7d79b8c3fc04b8a1fd2d..8045319deb27de773fdf8810a135579f7fc288f9 100644 (file)
--- a/media-plugins/gimp-python/gimp-python-2.10.20-r3.ebuild
+++ b/media-plugins/gimp-python/gimp-python-2.10.32.ebuild
@@ -1,14 +1,11 @@
-# Copyright © 2020-2021 Nick Bowler
+# Copyright © 2020-2022 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.
 
-EAPI=7
+EAPI=8
 
-_PYTHON_ALLOW_PY27=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
+inherit autotools
 
 MY_P=${P/-python/}
 
@@ -23,18 +20,15 @@ IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 DEPEND="dev-lang/python:2.7
        >=media-gfx/gimp-$PV
-       $(python_gen_cond_dep '
-               >=dev-python/pycairo-1.0.2:2[${PYTHON_USEDEP}]
-               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]')
+       >=dev-python/pycairo-1.0.2:2[python_targets_python2_7(+)]
+       >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(+)]
        !media-gfx/gimp[python(-)]"
 RDEPEND=$DEPEND
-REQUIRED_USE=$PYTHON_REQUIRED_USE
 
 S=$WORKDIR/$MY_P
 
 PATCHES=(
-       "$FILESDIR/$PV-no-mypaint-brushes.patch"
-       "$FILESDIR/$PV-configure-fixes.patch"
+       "$FILESDIR/2.10.20-no-mypaint-brushes.patch"
 )
 
 src_prepare () {
@@ -55,6 +49,7 @@ src_configure () {
                $(use_enable cpu_flags_x86_mmx mmx)
                $(use_enable cpu_flags_x86_sse sse)
                --enable-python
+               PYTHON=python2.7
        )
 
        econf "${myconf[@]}"

diff --git a/media-plugins/gimp-resynthesizer/Manifest b/media-plugins/gimp-resynthesizer/Manifest
new file mode 100644 (file)
index 0000000..376f024
--- /dev/null
+++ b/media-plugins/gimp-resynthesizer/Manifest
@@ -0,0 +1,2 @@
+DIST resynthesizer-2.0.3.tar.gz 11097693 BLAKE2B 51e064ed1a5d31dc3162a27b76c8b68d7652e3efdf2acad1844f4c76b47a6485b4e43788993c344a7154cddd8d2ac1ebda7c24f871ea8d6af332b1f15759f396 SHA512 de18fa41f5c3feaeff3365cc57b49f404f20439c6f84b212bc5cc76ee21f34566b8d093bebef1e6f27dbe3df6a23570dc091d23044a0967957ec0e97a16fa7c4
+EBUILD gimp-resynthesizer-2.0.3-r7.ebuild 728 BLAKE2B 1e7456e7371451c095339e3ecd161f78ff4ed724c682d856981973331220be387a467ee711cff310a4e479cd5da5a1f0c60bcb3adb164ed25e2542a3a0d6f5d3 SHA512 3b1e517382df636e062d3bb05bb404d4808a752b7c73b184756dc79422f0b2fdcef0e7f706fd7849a3f7ce3ddbe934403f23cc738cf5cc981413f2ae89b3d59d

diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r7.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r7.ebuild
new file mode 100644 (file)
index 0000000..c4c614c
--- /dev/null
+++ b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r7.ebuild
@@ -0,0 +1,31 @@
+# Copyright © 2020-2022 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.
+
+EAPI=8
+
+inherit autotools
+
+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 -> $MY_P.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-lang/python:2.7
+       || (
+               media-plugins/gimp-python[python_targets_python2_7(+)]
+               media-gfx/gimp[python(-)] )"
+
+S=$WORKDIR/$MY_P
+
+src_prepare () {
+       default
+       eautoreconf
+}