gentoo resync : 02.02.2022

4 files changed, 3 insertions, 163 deletions

diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index b52f6a55bfb9..fea957b10b9b 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,6 +1,3 @@
-AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90fc4f34376f8f5ea2eeeec239159baf0f7364b0be54406cab6833cf47129a08274704d231aa93e00460486238 SHA512 d1577e146b9274fa5e1e9652995c188b9c58d48ef6cd7ea82e08a966e31cbc5f36d27988628645d195c44601d2dc3861c5030dbc4fc4626955e709d74881ed3f
-DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
 DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
-EBUILD gupnp-igd-0.2.5-r10.ebuild 1437 BLAKE2B 878e30278be7c3c9048c099db41096d6699106e907136787f220e9c89e141d3c71e72982962798c51acdd436d1d48dd425c9d8de5da89b0223615b5cbda7c913 SHA512 f2cfb991cdb627ee24bebbe9fb6371319562823e90d4e29aaea53f10f146f0d67fa762f7e0f568afc8e766a19f7e9dd193fe47749d50c55e905e735a657dfe8c
-EBUILD gupnp-igd-1.2.0.ebuild 1141 BLAKE2B f3ce983d79138ba0a18c459409b68b0c35c0df3c98a2ffccd3645d515177c1a58cbf4d78b13406d176889fda651f3731698720c2f08bac750ef3ec3a6a9521b0 SHA512 1c117f5322386683c153c06e525b441deaed1b088bc011bce867ce27ef0207e2ad9a234a50053541924a2ea79d90a0bf018e1837c8bfcd8b93029fc6b0a15699
+EBUILD gupnp-igd-1.2.0.ebuild 1138 BLAKE2B a9d243fe6bfcc8ef3bbcd78b6c934693b376159d124893a26945cccb7db2b2570571d81472cef1beae470a14f81cd47a608fd9b9fbe501e2882817f54e14c9e3 SHA512 40ce670ee8ee71cd9af7b70868bfb31d1e278796930f86b5b828b8f338799b9dacdead1b620fbe4cc0e644a818e7767c63ce6b14ef32a1cf7bde7805c66ce7d9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch b/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
deleted file mode 100644
index c70bf6fea489..000000000000
--- a/net-libs/gupnp-igd/files/0.2.5-gupnp-1.2.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 1 Dec 2018 21:33:21 +0100
-Subject: [PATCH] Swtich to new GUPnP API
-
----
- configure.ac                    | 2 +-
- gupnp-igd-1.0-uninstalled.pc.in | 2 +-
- gupnp-igd-1.0.pc.in             | 2 +-
- libgupnp-igd/Makefile.am        | 2 +-
- tests/gtest/gupnp-simple-igd.c  | 6 ++++--
- 5 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f03921f..aa7f0ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
- AC_FUNC_MMAP
- 
--PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0)
-+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0)
- 
- # glib-genmarshal
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
-diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in
-index 483956f..6db3bee 100644
---- a/gupnp-igd-1.0-uninstalled.pc.in
-+++ b/gupnp-igd-1.0-uninstalled.pc.in
-@@ -5,7 +5,7 @@ includedir=${pcfiledir}/
- 
- Name: gupnp-igd-1.0
- Description: GUPnP Simple IGD library
--Requires: gupnp-1.0
-+Requires: gupnp-1.2
- Version: @VERSION@
- Libs: ${libdir}/libgupnp-av-1.0.la
- Cflags: -I${includedir}
-diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in
-index 6660d63..aa74ed3 100644
---- a/gupnp-igd-1.0.pc.in
-+++ b/gupnp-igd-1.0.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
- 
- Name: gupnp-igd-1.0
- Description: GUPnP Simple IGD library
--Requires: gupnp-1.0
-+Requires: gupnp-1.2
- Version: @VERSION@
- Libs: -L${libdir} -lgupnp-igd-1.0
- Cflags: -I${includedir}/gupnp-igd-1.0
-diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am
-index fe020b5..e10d857 100644
---- a/libgupnp-igd/Makefile.am
-+++ b/libgupnp-igd/Makefile.am
-@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0
- GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES)
- GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS)
- GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0
--GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0
-+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2
- GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir)
- 
- if HAVE_INTROSPECTION
-diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c
-index 9b32b2a..d051d13 100644
---- a/tests/gtest/gupnp-simple-igd.c
-+++ b/tests/gtest/gupnp-simple-igd.c
-@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
-   GUPnPDeviceInfo *subdev1;
-   GUPnPDeviceInfo *subdev2;
-   const gchar *xml_path = ".";
-+  GError *error = NULL;
- 
-   g_signal_connect (igd, "context-available",
-         G_CALLBACK (ignore_non_localhost), NULL);
- 
-   if (mainctx)
-     g_main_context_push_thread_default (mainctx);
--  context = gupnp_context_new (NULL, "lo", 0, NULL);
-+  context = gupnp_context_new ("lo", 0, NULL);
-   g_assert (context);
- 
-   if (g_getenv ("XML_PATH"))
-@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd,
-   gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml");
-   */
- 
--  dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path);
-+  dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error);
-   g_assert (dev);
-+  g_assert (error == NULL);
- 
-   subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev),
-       "urn:schemas-upnp-org:device:WANDevice:1");
--- 
-2.24.1
-
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
deleted file mode 100644
index 664a38dca04f..000000000000
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5-r10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome.org multilib-minimal xdg
-
-DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
-HOMEPAGE="http://gupnp.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.2:0=[${MULTILIB_USEDEP}]
-	>=net-libs/gupnp-1.2:0=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# The only existing test is broken
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gupnp-1.2.patch # needs eautoreconf, https://gitlab.gnome.org/GNOME/gupnp-igd/merge_requests/1
-)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# python is old-style bindings; use introspection and pygobject instead
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-gtk-doc \
-		--disable-python \
-		$(multilib_native_use_enable introspection)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
index 7b036f45c5e2..1b9cd1ffa98f 100644
--- a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="