Work around python-r1 eclass dropping python2.

Welp, apparently upstream eclass changes have just up and prevented
python2 packages from working at all.

Fortunately there seems to be a magic variable that unbreaks it.

diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index df91dea3f4f850db3592e13be0995cc079bb2ed7..e9f8ccf88300c68792e33d114686cb069c1bb821 100644 (file)
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,4 +1,4 @@
 AUX pycairo-1.18.2-no-setuptools.patch 390 BLAKE2B 2e96d663534447de9aadd2a688dd6277a35ff2f9f3ea3f8a9bd060d4fffca36c565ac0ba4dff2b1fe470ac55cace671b7875a387d85fcaf307a289727f922190 SHA512 31775030b33a756a5075b793f5a4b6c3998f42b6a98f612aa991a2c8ed72263363aaf2dcf43bbd2357adb8897f372e3cd88526fe1b14f3ed645cde53386127f0
 AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb904806d4016088d0c6882958ce7edeba2517f3ab4b8139a8f923e3baec435bc9a21cf3546b60f4459c5cc9ad7a54d6 SHA512 607d6f2cf6bcaec394b755f452d3c4bc0f6edb39bea185a18258c1ee0db11a99d84c7605dbe9db83906518d41baf065b2b8d9261db3736f8a737a2a8f7dff266
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
-EBUILD pycairo-1.18.2-r2.ebuild 1690 BLAKE2B 9a5131ad3db9abc34162ededf21b91d6220d27da076e58a61bc3cae4b6f2be79c6ebe5452606f1dd5ab92fbc44e897f908897ab13f4b6d600f4da5b982ecc4f4 SHA512 2648f3ea1df1c918a972ce17c93e55b08d866b1a24f7e328d9a85a35b4bb7bfb7cef8216f33a6c6391fe6719f333e986717461f256b86ceaba8cf44995c4aa2b
+EBUILD pycairo-1.18.2-r3.ebuild 1714 BLAKE2B d86b6b31c5d4d84b5342f732759ed173bdd30210db792751948573ddaca2a87af67015b8640e46912fe30f0cfd8397d7a3bb222e4ca9e49e9644bb7cf9448be1 SHA512 ca1dc55c53fe187970064c84ccdfe024c21ffba3dd76052ab00dc1c1f9e9c7145411e77ca9b6f953f3ee905244685af08405ce63486c54c42d3c2685d1853d2b

diff --git a/dev-python/pycairo/pycairo-1.18.2-r2.ebuild b/dev-python/pycairo/pycairo-1.18.2-r3.ebuild
similarity index 96%
rename from dev-python/pycairo/pycairo-1.18.2-r2.ebuild
rename to dev-python/pycairo/pycairo-1.18.2-r3.ebuild
index b775f06014a99c33caec8c0e2b6593545023bca0..a9338d31efc65633170473f6843a0aa34a5c1a48 100644 (file)
--- a/dev-python/pycairo/pycairo-1.18.2-r2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright © 2020 Nick Bowler
+# Copyright © 2020-2021 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.
@@ -10,8 +10,9 @@
 #   Copyright 1999-2020 Gentoo Authors
 #   Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
+_PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 1acab78d33fb7b991a486d21318c2f2f853d1ecc..e52e9d6d6f9185ce4ce722c70811754da014ac3b 100644 (file)
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -8,4 +8,4 @@ AUX pygobject-2.28.6-python-byte-compile.patch 539 BLAKE2B b2d64ab0ad8943948c7bf
 AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625a3ab7b59afece84157bf0b9abd0aca5ae68b7ac8cc627a47a5b1a688029d592abcc38e403543a4144e055bcdac68285e4 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
-EBUILD pygobject-2.28.6-r56.ebuild 3789 BLAKE2B 08d12f3ee8dd9c7355cf8b10fb7c39e8bf83f8beaad1895b5c02d5b79313ece6bf2efda31ba6af19d540f7657df30362c97e8d36e618d237d6c32a791a6ffef6 SHA512 552af976c6fe3d6fbccd77a15b4e84265b9a4752596d181020654d93bb7b46a2d88ba10dd2834a685a0e35b93ef8eedb657bbfe7fdebb1adcc597b5151f1ca35
+EBUILD pygobject-2.28.6-r57.ebuild 3815 BLAKE2B 13bdd3340133165e52ccb240be031a7c0734ded439b0a0fa8f37dfd70c9769d9db04f240fbd2dc5921ab30a504f50862f749164e13de037bd721ebb45da3f7cd SHA512 98644b9e87663905975455384609196c1e9026a54644a748487683d9dfbf202f29ac29ea289ba38d987796e38e4496e011b6b7cdaa702fc37e9210d176bbe0a4

diff --git a/dev-python/pygobject/pygobject-2.28.6-r56.ebuild b/dev-python/pygobject/pygobject-2.28.6-r57.ebuild
similarity index 98%
rename from dev-python/pygobject/pygobject-2.28.6-r56.ebuild
rename to dev-python/pygobject/pygobject-2.28.6-r57.ebuild
index dfb017b7f0d210fb1d3864d29b0e32399633d122..78e9cfeff7f3a6cdbbcfc27188352ba86b2d977c 100644 (file)
--- a/dev-python/pygobject/pygobject-2.28.6-r56.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r57.ebuild
@@ -1,4 +1,4 @@
-# Copyright © 2020 Nick Bowler
+# Copyright © 2020-2021 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.
@@ -10,11 +10,12 @@
 #   Copyright 1999-2020 Gentoo Authors
 #   Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GNOME2_LA_PUNT=yes
 GNOME2_EAUTORECONF=yes
 
+_PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils gnome2 python-r1 virtualx

diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index bf46170a065cb3d1864a4f6cbf0d234237f82951..764e90713f213118ddcbc1fad24bdc4e29706a7a 100644 (file)
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -6,4 +6,4 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70
 AUX pygtk-2.24.0-test-fail.patch 252 BLAKE2B 9d808e50d9e64f481cd8d83e4693a60f472d4cf75b3d356c49d73056939b25d48842a1a64becbb17220ac74adb466deec0d1a42081144c7f853a5f5d1c7fddfa SHA512 22965a5ccc14ba842551ca07ca31d3a26f246354e35a7a24f66c34ace41fa1ee51a46ab404a103a8824957d5a197469ff6762eb829e236269420ba1842cb351b
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r5.ebuild 2726 BLAKE2B 215bcda1b47158066a99d02c7bb8bc4e258b7dfe9f6cba3cd14345aa48d13afacb311e7250223c310da1d717764016cd542ec0d9a64fd2091a6aa15062cc6b26 SHA512 a81527c9277955166c0529452e74d52e9a28df9c1ce140e528f7e2d7beb294d98ee77d256d5bc8b0dec5a18d46f4901463791e33956afd7308736fec823b26dd
+EBUILD pygtk-2.24.0-r6.ebuild 3127 BLAKE2B 42e8978d176855b454cdc31ecaccb58be0d0f2a29522fd8d69dc58256c2a36d2f97f95dce7d504a5dc43f1d9aca5511cb6119126cdb99a1a15afcdc5f5cd4455 SHA512 a720ff7f946c596ec64efcf29a457e8130fd5190d19ed4bd92dabef1dae397367b67ad9741646690fc6072b3d62378ba6b870b774a753dc193dd3523616c6f40

diff --git a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild b/dev-python/pygtk/pygtk-2.24.0-r6.ebuild
similarity index 78%
rename from dev-python/pygtk/pygtk-2.24.0-r5.ebuild
rename to dev-python/pygtk/pygtk-2.24.0-r6.ebuild
index c23bff38d1dcb54f1294d9aa4139ce183d2356e7..a73bcd51fea2597cf953f92b22d587e09fb058e6 100644 (file)
--- a/dev-python/pygtk/pygtk-2.24.0-r5.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r6.ebuild
@@ -1,10 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
+# Copyright © 2021 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
 
 GNOME_TARBALL_SUFFIX="bz2"
 
+_PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit autotools flag-o-matic gnome2 python-r1 virtualx
@@ -27,14 +37,11 @@ RDEPEND="${PYTHON_DEPS}
        >=x11-libs/gtk+-2.24:2
        >=dev-python/pycairo-1.0.2:2[$PYTHON_USEDEP]
        >=dev-python/pygobject-2.26.8-r53:2[$PYTHON_USEDEP]
-       >=gnome-base/libglade-2.5:2.0
-"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       doc? (
-               dev-libs/libxslt
-               >=app-text/docbook-xsl-stylesheets-1.70.1 )
-"
+       >=gnome-base/libglade-2.5:2.0"
+DEPEND=$RDEPEND
+BDEPEND="virtual/pkgconfig
+       doc? ( dev-libs/libxslt
+               >=app-text/docbook-xsl-stylesheets-1.70.1 )"
 
 PATCHES=(
        # Fix declaration of codegen in .pc

diff --git a/media-plugins/gimp-resynthesizer/Manifest b/media-plugins/gimp-resynthesizer/Manifest
index 1e670dcfc964561e79a12d17331abc263f81889b..b458af3f428927263943ba2ccea18baf38e10cec 100644 (file)
--- 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-r4.ebuild 1097 BLAKE2B 8484b92fe3cf86f6e8dfbbbe7b0e7c0d7a34c70b2c2f117d8cee6727dc408d5f57f4e4494657a61edfa600f6099d44c6b6482103190c599927d9a2d62c6d7206 SHA512 f343fbc71517858e554573d3666e8138a845039a48b274d00db996e946c7a11773da079c1de8cda2be34e20598fb5e5ab3f1a02c137f8ab8c58d92ebe4b46bd6
+EBUILD gimp-resynthesizer-2.0.3-r5.ebuild 1123 BLAKE2B 56bf4315af558cb323faa5880cd8cbaf7c9617e98b471fe3c4e969f2cbc13d90c8311e0e6a1472f94cf7445718d3445da3c99997476b32510b60789447804faf SHA512 121153223ea1ffc8119a88c5299ada94dec6c1ca51dd2b8704c1bc3ab3ba111aa73c713240395472cf4d3b65ab3bdb7669a2303f98e5e3d7423380eeb2724e43
 MISC metadata.xml 651 BLAKE2B fce88379f37caa26affce3b55ab152952ab8ca7578b5f2cc19daf93228ec11211c32e278b194c2f9d55ed330c4de94abfdfdf0b99f2612bb85e1bf5187f431f9 SHA512 ee4c49df50d6e834d27093eaf2c6639749b625402003fd3a2575ad514a73cb0e71a3a0d8dbed807660ad0011a4fa6fac7c5d7e0899bcd137cc43749197f93501

diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r5.ebuild
similarity index 94%
rename from media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild
rename to media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r5.ebuild
index ca877684a2674f4e0773e7bd3ea99a07dc4b6f7a..90fafb87324c8512d6ef586e680dc0b96d98bab1 100644 (file)
--- a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r4.ebuild
+++ b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright © 2020 Nick Bowler
+# Copyright © 2020-2021 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.
@@ -12,6 +12,7 @@
 
 EAPI=7
 
+_PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit autotools python-single-r1