gentoo resync : 29.12.2022

3 files changed, 46 insertions, 12 deletions

diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index fc180f38fe09..371596cf4f62 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,4 @@
+AUX dbus-test-runner-19.04.0-fix-deprecation-warnings.patch 1197 BLAKE2B 47323d9a859b24e478732be15a33ad5f96cb692d03132ee2923bca041bfef38b40cb54e3fc16f0ecc2232029fee80d5fbd03410a32dc93dc3acc580bd099118c SHA512 41c283e256df1d2436d1d3cb1ebdb1e89971dba17eec588800cba5f65da10766de523f0f891e559c405c6fa05ae020525ee30d7b15f57e55dd9681d5ad2ae78c
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r1.ebuild 1269 BLAKE2B adf7799abfe829d57446e8357a2aa457a0c14504e62e87ad3356e1cd841f06f4fcc8e6ff41b20f75360bed64b77ec7d63896fc2d0dcdd86a9321dfb7daed04eb SHA512 fd884c48c2da2ab342abe40660a2f243c8dd871c19f04d3f98617c6917ac144c9243bfe066262bc94e46b3d4817ee8b7c8e4b26fc97d62f9ac2111a2fbb11101
+EBUILD dbus-test-runner-19.04.0-r2.ebuild 1359 BLAKE2B 0354f7388d1c9b9b59d84b8a3d853b805f34d653156126fbf8f5d508d56de64e8d804cbc0f1767cb8c8b9115b91a1058a18e48faa193f2b18bb37f50c3eea394 SHA512 b362c519c65d978f6f261a7a8b2f586d57cf4d71b3403452ec15bc9dcfa9c776e7a95c8ccfb636d86c9c12410716f2105fe6684ad32f0444dcbf8061e900e39d
 MISC metadata.xml 334 BLAKE2B 27ab7a8e8a84b7a33f23751ebe0957ee5275e95f97ace2983a3b1f05235cc5aff143b18ab4ce6deb611fabb34d2ab749cf110e682cbc250f5170ef72bfc66439 SHA512 a3208a00f3d7eda6ed24c70fde9eae4ce763c2ae20225fd41e430362e14ad6796ac43c5a9ae1926f44c2210fb4eb81885b6f37031197e34358398a4072b1d93d
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
index a2054f799641..6a8bc631704b 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit flag-o-matic python-single-r1
 
 DESCRIPTION="Run executables under a new DBus session for testing"
@@ -14,15 +14,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
-# now optional:
-#	test? ( dev-util/bustle )
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-"
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/dbus-glib
 	dev-libs/glib:2
@@ -39,6 +34,14 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/python-dbusmock[${PYTHON_USEDEP}]
 	')
 "
+# hard-disabled:
+#	test? ( dev-util/bustle )
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-deprecation-warnings.patch ) # Debian patch
 
 src_prepare() {
 	default
@@ -49,7 +52,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static
+	econf ac_cv_prog_have_bustle=no
 }
 
 src_install() {
diff --git a/dev-util/dbus-test-runner/files/dbus-test-runner-19.04.0-fix-deprecation-warnings.patch b/dev-util/dbus-test-runner/files/dbus-test-runner-19.04.0-fix-deprecation-warnings.patch
new file mode 100644
index 000000000000..62b731f33469
--- /dev/null
+++ b/dev-util/dbus-test-runner/files/dbus-test-runner-19.04.0-fix-deprecation-warnings.patch
@@ -0,0 +1,30 @@
+Description: tests: Replace deprecated g_main_{pending,iteration} with current g_main_context_{pending,iteration}
+Author: Iain Lane <laney@debian.org>
+Origin: https://bazaar.launchpad.net/~indicator-applet-developers/dbus-test-runner/trunk.16.10/revision/109
+
+Index: dbus-test-runner/tests/test-libdbustest-mock.c
+===================================================================
+--- dbus-test-runner.orig/tests/test-libdbustest-mock.c
++++ dbus-test-runner/tests/test-libdbustest-mock.c
+@@ -389,8 +389,8 @@ test_signals (void)
+ 	g_assert(dbus_test_dbus_mock_object_emit_signal(mock, obj, "testsig", NULL, NULL, NULL));
+ 
+ 	g_usleep(100000);
+-	while (g_main_pending())
+-		g_main_iteration(TRUE);
++	while (g_main_context_pending(NULL))
++		g_main_context_iteration(NULL, TRUE);
+ 
+ 	g_assert(signal_count == 1);
+ 
+@@ -410,8 +410,8 @@ test_signals (void)
+ 	g_assert(dbus_test_dbus_mock_object_emit_signal(mock, obj, "testsig_abc", G_VARIANT_TYPE("(sss)"), g_variant_new_parsed("('a', 'b', 'c')"), NULL));
+ 
+ 	g_usleep(100000);
+-	while (g_main_pending())
+-		g_main_iteration(TRUE);
++	while (g_main_context_pending(NULL))
++		g_main_context_iteration(NULL, TRUE);
+ 
+ 	g_assert(signal_abc_count == 1);
+