media-plugins/gimp-python: Fix build with autoconf-2.71.

Fix some sloppy configure.ac code which results in problems when
bootstrapping with newer autoconf.

diff --git a/media-plugins/gimp-python/Manifest b/media-plugins/gimp-python/Manifest
index cb7cf37b287addda6572aa0f69a427a62d0db5f2..1898069fbb8ae30c5a099f9c6ae9c1b03360c727 100644 (file)
--- a/media-plugins/gimp-python/Manifest
+++ b/media-plugins/gimp-python/Manifest
@@ -1,3 +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-r2.ebuild 1476 BLAKE2B 0db3d9bf5e4a6cca17fc4675a042fbf8c500e3dfc34c004f99144d30e967a96c64d4a82f43b1fa017154606b8917060f9c01a33dc9b68ecb4c809758c3ea1a8c SHA512 0ea50f2b0549cad03f4d97a5e8732a121eaec0bc430fcdc9ff915647e7f1215c4ef89617047b02365639b106f159f364307119163827a5406a02fd2027e7a9db
+EBUILD gimp-python-2.10.20-r3.ebuild 1518 BLAKE2B 7714ee33b003c31876487f19fbb012f772bdbf56b1ec079eea90754adde413acd20ce1ffde299c85f11da436bbc25ec5f04f1f2638f3bce55873acc1eb4043dd SHA512 6929273d445a97e9509224863525d372d002d7e29821e242428f0298d1e10df7e03eacd8099b29522ac31900b688070c8037eef19b7ec0d647da4f2ae81da3cc

diff --git a/media-plugins/gimp-python/files/2.10.20-configure-fixes.patch b/media-plugins/gimp-python/files/2.10.20-configure-fixes.patch
new file mode 100644 (file)
index 0000000..5fac03b
--- /dev/null
+++ b/media-plugins/gimp-python/files/2.10.20-configure-fixes.patch
@@ -0,0 +1,29 @@
+diff --git a/configure.ac b/configure.ac
+index 71b13db..7eb5d95 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2132,16 +2132,14 @@ fi
+ AC_ARG_WITH(linux-input, [  --without-linux-input   don't build linux input event controller module])
+ 
+ have_linux_input="no (linux input support disabled)"
+-if test "x$with_linux_input" != "xno"; then
+-  AC_CHECK_HEADER(linux/input.h,
+-      AC_CHECK_DECL(KEY_OK,
+-              have_linux_input=yes,
+-              have_linux_input="no (needs Linux 2.6)",
+-              [#include <linux/input.h>]))
+-fi
+-
+-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
+-
++AS_IF([test "x$with_linux_input" != "xno"],
++  [AC_CHECK_HEADER([linux/input.h],
++    [AC_CHECK_DECL([KEY_OK],
++              [have_linux_input=yes],
++              [have_linux_input="no (needs Linux 2.6)"],
++              [#include <linux/input.h>])])])
++
++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
+ 
+ ###############################
+ # Check for DirectX DirectInput

diff --git a/media-plugins/gimp-python/gimp-python-2.10.20-r2.ebuild b/media-plugins/gimp-python/gimp-python-2.10.20-r3.ebuild
similarity index 93%
rename from media-plugins/gimp-python/gimp-python-2.10.20-r2.ebuild
rename to media-plugins/gimp-python/gimp-python-2.10.20-r3.ebuild
index 479a89735402e7088d7eef5eabf58cceaba7025d..099a47653039d4695c3a7d79b8c3fc04b8a1fd2d 100644 (file)
--- a/media-plugins/gimp-python/gimp-python-2.10.20-r2.ebuild
+++ b/media-plugins/gimp-python/gimp-python-2.10.20-r3.ebuild
@@ -32,7 +32,10 @@ REQUIRED_USE=$PYTHON_REQUIRED_USE
 
 S=$WORKDIR/$MY_P
 
-PATCHES=("$FILESDIR/$PV-no-mypaint-brushes.patch")
+PATCHES=(
+       "$FILESDIR/$PV-no-mypaint-brushes.patch"
+       "$FILESDIR/$PV-configure-fixes.patch"
+)
 
 src_prepare () {
        sed -i '/^libgimp/s|[^ ]*/lib\(gimp[^-]*\)-[^ ]*\.la|-l\1-2.0|' \