From c2b5a3364405a40881ed2ecb776821213d163171 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 10 Jun 2018 10:00:38 +0300 Subject: dev-libs/glib-2.54: port to python-single-r1 Use python-single-r1 instead of python_replicate_script and let upstream --with-python do its work (don't patch it out anymore in gdbus-codegen patch). We pass --with-python to end up with proper /usr/bin/env based shebangs (otherwise it is based on $PYTHON, which includes absolute path, unlike EPYTHON) Closes: https://bugs.gentoo.org/651830 Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- .../files/glib-2.54.3-external-gdbus-codegen.patch | 27 ++-------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'dev-libs/glib/files') diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch index 45025b65551a..4f3e1784c887 100644 --- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch +++ b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch @@ -4,40 +4,17 @@ Date: Fri, 23 Feb 2018 15:27:33 +0330 Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools --- - configure.ac | 17 ++++++++--------- + configure.ac | 1 - docs/reference/gio/Makefile.am | 1 - gio/Makefile.am | 2 +- gio/tests/Makefile.am | 6 ++---- gio/tests/gdbus-object-manager-example/Makefile.am | 8 +++----- - 5 files changed, 14 insertions(+), 20 deletions(-) + 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 0457c90..07166c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -382,14 +382,14 @@ AC_SUBST(PERL_PATH) - # option to specify python interpreter to use; this just sets $PYTHON, so that - # we will fallback to reading $PYTHON if --with-python is not given, and - # python.m4 will get the expected input --AC_ARG_WITH(python, -- AS_HELP_STRING([--with-python=PATH], -- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), -- [PYTHON="$withval"], []) --if test x"$PYTHON" = xyes; then -- AC_MSG_ERROR([--with-python option requires a path or program argument]) --fi --AM_PATH_PYTHON(2.7,,PYTHON="python2.7") -+#AC_ARG_WITH(python, -+# AS_HELP_STRING([--with-python=PATH], -+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), -+# [PYTHON="$withval"], []) -+#if test x"$PYTHON" = xyes; then -+# AC_MSG_ERROR([--with-python option requires a path or program argument]) -+#fi -+#AM_PATH_PYTHON(2.7,,PYTHON="python2.7") - - - dnl *********************** @@ -3469,7 +3469,6 @@ gobject/glib-mkenums gobject/tests/Makefile gthread/Makefile -- cgit v1.2.3-65-gdbad