dev-libs/glib: import the fixes from the main tree

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1

2 files changed, 32 insertions, 80 deletions

diff --git a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
index 7e73f748..a27966e0 100644
--- a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
+++ b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch
@@ -1,44 +1,21 @@
-From db0a3301203e0c62db274bde8ac20cbfbb71889f Mon Sep 17 00:00:00 2001
+From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
 From: Sobhan Mohammadpour <sobhan@gentoo.org>
 Date: Fri, 23 Feb 2018 15:27:33 +0330
-Subject: [PATCH 2/2] glib-2.54.3-external-gdbus-codegen-for-autotools
+Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
 
 ---
- configure.ac                                    | 17 ++++++++---------
- docs/reference/gio/Makefile.am                  |  1 -
- gio/Makefile.am                                 | 12 ++++--------
- gio/tests/Makefile.am                           |  6 ++----
- .../gdbus-object-manager-example/Makefile.am    |  6 ++----
- 5 files changed, 16 insertions(+), 26 deletions(-)
+ 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 |  6 ++----
+ 5 files changed, 5 insertions(+), 11 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2013d198e..7d2d686c5 100644
+index 0457c90..07166c9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -360,14 +360,14 @@ AC_CHECK_PROGS(PERL, [perl5 perl])
- # 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 ***********************
-@@ -3567,7 +3567,6 @@ gobject/glib-mkenums
+@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
  gobject/tests/Makefile
  gthread/Makefile
  gio/Makefile
@@ -47,10 +24,10 @@ index 2013d198e..7d2d686c5 100644
  gio/gnetworking.h
  gio/xdgmime/Makefile
 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index e04ab6843..3a518af02 100644
+index 5741a3e..d38e768 100644
 --- a/docs/reference/gio/Makefile.am
 +++ b/docs/reference/gio/Makefile.am
-@@ -178,7 +178,6 @@ man_MANS +=				\
+@@ -177,7 +177,6 @@ man_MANS +=				\
  	gsettings.1			\
  	gresource.1			\
  	gdbus.1				\
@@ -59,7 +36,7 @@ index e04ab6843..3a518af02 100644
  	$(NULL)
  
 diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 67b7fa966..334c6e32d 100644
+index b2db995..53d7162 100644
 --- a/gio/Makefile.am
 +++ b/gio/Makefile.am
 @@ -1,6 +1,6 @@
@@ -69,36 +46,12 @@ index 67b7fa966..334c6e32d 100644
 +SUBDIRS = 
  
  if OS_UNIX
- SUBDIRS += xdgmime
-@@ -101,10 +101,8 @@ GDBUS_PYTHON_DEPS = 					\
- 	$(builddir)/gdbus-2.0/codegen/config.py 	\
- 	$(srcdir)/gdbus-2.0/codegen/utils.py
- 
--gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml $(GDBUS_PYTHON_DEPS)
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
-+gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org. \
- 		--generate-c-code gdbus-daemon-generated \
- 		--c-namespace _G \
-@@ -375,9 +373,7 @@ portal_interfaces = \
- EXTRA_DIST += $(portal_interfaces)
- 
- $(xdp_dbus_built_sources) : $(portal_interfaces)
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) 		\
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) 		\
--		$(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in 	\
-+	$(AM_V_GEN) gdbus-codegen 	\
- 		--interface-prefix org.freedesktop.portal.      	\
- 		--c-namespace GXdp					\
- 		--generate-c-code $(builddir)/xdp-dbus			\
+ if !OS_COCOA
 diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 14cd928d2..2fd7a6e41 100644
+index acc1da4..7c51eab 100644
 --- a/gio/tests/Makefile.am
 +++ b/gio/tests/Makefile.am
-@@ -483,10 +483,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
+@@ -460,10 +460,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
  
  BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
  gdbus-test-codegen.o: gdbus-test-codegen-generated.h
@@ -112,7 +65,7 @@ index 14cd928d2..2fd7a6e41 100644
  		--generate-c-code gdbus-test-codegen-generated \
  		--c-generate-object-manager \
 diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 1d0464c5c..0603d9b0a 100644
+index 1d0464c..f390dca 100644
 --- a/gio/tests/gdbus-object-manager-example/Makefile.am
 +++ b/gio/tests/gdbus-object-manager-example/Makefile.am
 @@ -11,10 +11,8 @@ GDBUS_GENERATED = \
@@ -129,5 +82,5 @@ index 1d0464c5c..0603d9b0a 100644
  		--c-namespace Example \
  		--c-generate-object-manager \
 -- 
-2.17.0
+2.16.1
 
diff --git a/dev-libs/glib/glib-2.56.1.ebuild b/dev-libs/glib/glib-2.56.1-r1.ebuild
index 06c64dfa..8ff7a9f9 100644
--- a/dev-libs/glib/glib-2.56.1.ebuild
+++ b/dev-libs/glib/glib-2.56.1-r1.ebuild
@@ -6,13 +6,13 @@
 # then to be think very closely.
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 # Completely useless with or without USE static-libs, people need to use
 # pkg-config
 GNOME2_LA_PUNT="yes"
 
 inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
+	multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/"
@@ -23,9 +23,9 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
+	${PYTHON_REQUIRED_USE}
 	test? ( ${PYTHON_REQUIRED_USE} )
-"
+" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
@@ -44,9 +44,9 @@ RDEPEND="
 	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
 	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
 	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}
 	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=dev-util/gdbus-codegen-${PV}
 		virtual/libelf:0=
 	)
 "
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 	test? (
 		sys-devel/gdb
 		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=dev-util/gdbus-codegen-${PV}
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2
 "
@@ -84,6 +84,8 @@ pkg_setup() {
 		fi
 		linux-info_pkg_setup
 	fi
+	# FIXME: Move python deps that are only required at build time of other packages to a split package
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -119,14 +121,9 @@ src_prepare() {
 
 	# gdbus-codegen is a separate package
 	eapply "${FILESDIR}"/${PN}-2.56.1-external-gdbus-codegen-for-autotools.patch
+	# Leave gtester-report python shebang alone - handled by python_fix_shebang
+	sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die
 
-	# Leave python shebang alone - handled by python_replicate_script
-	# We could call python_setup and give configure a valid --with-python
-	# arg, but that would mean a build dep on python when USE=utils.
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-	sed -e 's:@PYTHON@:python:' \
-		-i gobject/glib-{genmarshal.in,mkenums.in} || die
 	# Also needed to prevent cross-compile failures, see bug #267603
 	eautoreconf
 
@@ -181,6 +178,7 @@ multilib_src_configure() {
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
 		$(multilib_native_use_enable utils libelf) \
+		--with-python=${EPYTHON} \
 		--disable-compile-warnings \
 		--enable-man \
 		--with-pcre=system \
@@ -225,8 +223,9 @@ multilib_src_install_all() {
 	einstalldocs
 
 	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
+		python_fix_shebang "${ED}"/usr/bin/gtester-report
 	else
+		# gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
 		rm "${ED}usr/bin/gtester-report"
 		rm "${ED}usr/share/man/man1/gtester-report.1"
 	fi