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/media-plugins/gimp-plugin-export-layers/Manifest b/media-plugins/gimp-plugin-export-layers/Manifest
index 134318952400dabb2cc3dcb8f995acef68af632a..95ddaa5dad9c8809fd2a7b10c66773b984068e5f 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-r1.ebuild 940 BLAKE2B 2d0bd6650f2030812bdc6d1bf63ad3e98c2e353336a24d8083a8659a2e30d46c15a9c97f7b40ddf0e9a906d598fcc04ca94baccbfe08b51d0161ab072bc86d30 SHA512 b2b4c77d206cf0feed5669d1c85e4fe09f62a1234b93622994f78b9d41bc3e7be64e8b04f913a286f19a9a944bd20c7d9d534ba63511f397ca0c5499ba76d7aa
+EBUILD gimp-plugin-export-layers-3.3.1-r2.ebuild 966 BLAKE2B cd2e221256f992bfb708e0520993bc21ece8fab9f0129ce3643acf4410ae3ce4049feddb1fb05e83f58d8f3bb9fcceab5881074e2f565c3e24f1ad8cdc606a91 SHA512 f05766497389061d3fc1b5f96420a939bfbc7db519391af1271d756350997b74d4254253062287870e71db19afcaeb634e2d1624150d41a32dbded13ed96d16d

diff --git a/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r1.ebuild b/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r2.ebuild
similarity index 93%
rename from media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r1.ebuild
rename to media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r2.ebuild
index cc0b94d73385c085a94edd31a69fa3a67285330a..8a1403e70b6ae933b6b95c1e67414c5f16aa07b1 100644 (file)
--- a/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r1.ebuild
+++ b/media-plugins/gimp-plugin-export-layers/gimp-plugin-export-layers-3.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright © 2020 Nick Bowler
+# 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.
@@ -6,6 +6,7 @@
 
 EAPI=7
 
+_PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1 multilib

diff --git a/media-plugins/gimp-python/Manifest b/media-plugins/gimp-python/Manifest
index aa3832bbc05bffd465e9da9acedd2b836dbba15c..757f975731fdffea907a7b9705d8e79877332807 100644 (file)
--- a/media-plugins/gimp-python/Manifest
+++ b/media-plugins/gimp-python/Manifest
@@ -1,2 +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.ebuild 1391 BLAKE2B 8c9668f92457dff226bc6f707cbd1d333e7406d4eb0ac995c903033d748b851b62d7709ea9650ad5a622d85cc88966632ae2bbf253c029ddf63960940e04fa2c SHA512 72b7fec13a785ce41f3e5483a3d34336d3781bc1e589018df4b004102b4a950142998fd8dc4d175c54dabdb384388d533ccd3c46505b1de0e957dbfbd72d9f3c
+EBUILD gimp-python-2.10.20-r1.ebuild 1469 BLAKE2B 4ea932652db268cc70fff6375e7758023760281d1267cd3145d9bffad495c72bea14d46b2d00a149631003e74ba8b779f25e937a96b6ecaee1283335d0854795 SHA512 5ab5f59b71898f1a3f9bd2a3c857025693d26e244e720181768752f2c2a47592acd993c5faea94caa4a2096c8a01eedbc48a3f5af97471c7cef07f6aac279574

diff --git a/media-plugins/gimp-python/files/2.10.20-no-mypaint-brushes.patch b/media-plugins/gimp-python/files/2.10.20-no-mypaint-brushes.patch
new file mode 100644 (file)
index 0000000..6f2a8db
--- /dev/null
+++ b/media-plugins/gimp-python/files/2.10.20-no-mypaint-brushes.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac.orig b/configure.ac
+index 38ebdd1..71b13db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1932,14 +1932,7 @@ WARNING: libmypaint lower than version 1.4.0 is known to crash when
+          parsing MyPaint 2 brushes. Please update."
+   ])
+ 
+-PKG_CHECK_MODULES(MYPAINT_BRUSHES, mypaint-brushes-1.0,,
+-                  [add_deps_error([mypaint-brushes-1.0])])
+-
+-if test "x$enable_relocatable_bundle" != xno; then
+-  mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes'
+-else
+-  mypaint_brushes_dir=`$PKG_CONFIG --variable=brushesdir mypaint-brushes-1.0`
+-fi
++mypaint_brushes_dir=//not/used/by/pygimp
+ AC_SUBST(mypaint_brushes_dir)
+ 
+ 

diff --git a/media-plugins/gimp-python/gimp-python-2.10.20.ebuild b/media-plugins/gimp-python/gimp-python-2.10.20-r1.ebuild
similarity index 92%
rename from media-plugins/gimp-python/gimp-python-2.10.20.ebuild
rename to media-plugins/gimp-python/gimp-python-2.10.20-r1.ebuild
index f77a72b0d660cb3a18df4e520d351832a0fae105..300c7863f2cf387cb1774e23a45e7cefdfc56dc1 100644 (file)
--- a/media-plugins/gimp-python/gimp-python-2.10.20.ebuild
+++ b/media-plugins/gimp-python/gimp-python-2.10.20-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright © 2020 Nick Bowler
+# 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.
 
 EAPI=7
 
+_PYTHON_ALLOW_PY27=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit autotools python-single-r1
@@ -31,6 +32,8 @@ REQUIRED_USE=$PYTHON_REQUIRED_USE
 
 S=$WORKDIR/$MY_P
 
+PATCHES=("$FILESDIR/$PV-no-mypaint-brushes.patch")
+
 src_prepare () {
        sed -i '/^libgimp/s|[^ ]*/lib\(gimp[^-]*\)-[^ ]*\.la|-l\1-2.0|' \
                plug-ins/pygimp/Makefile.am