gentoo resync : 31.05.2021

4 files changed, 2 insertions, 119 deletions

diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 49365a74cd93..4ad2c25c8443 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6.0-gupnp-1.2.patch 2449 BLAKE2B 25aba7b48ef6dfef1d1dbe1c229fefc8c395c8ab1b393a49b6382662437137f628a7e4565aff701331375aae89fbdc3d6b8408d606694ca540036eb87743415b SHA512 9f0ba14980cb9238b576f40802c11e718a42576fd5f33fabf0ff4a2be186533bc6113ae88f1d554894d2205b7824a3a83f7fb99b43559a1c0add8ee07c8adf48
-DIST dleyna-server-0.6.0.tar.gz 107573 BLAKE2B c2460d20ac12d377170fc1292efa48ccec218b7c8e6f2d463a159bda801a7e9a5cfd239e51bcf9d997124a0a9ff305f3a4047228d54a55b26407fb1e37b2e238 SHA512 5fecc48f72afdac46da04d1785cf49384ed84b078802e4703cd86dc8e2c5db64df0232f66b73c73b3f358f7248117cd00fa4652397619d87f8f4a305e047306c
 DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
-EBUILD dleyna-server-0.6.0.ebuild 841 BLAKE2B e5014558bdd82997482c12db73ad825001fc73adb1196db18d6979f399ccb56dc531d8470e12a1d4ff70f1c6e51ed7625aca13990bd540a2a0aaf4426c1163e5 SHA512 99bfb47d58eb2590508b8213c87fe830c9b2c9ad79648c47e89b5050fcd201ba4043db829b278ea0e2e8f937b99fba066efb8f50f92316547717f3d2791485da
-EBUILD dleyna-server-0.7.0.ebuild 676 BLAKE2B 12d52c5bdd438af72bbbf711827a539d7ca77a6f7e565fd50ed979cb3893dea9386c5fa79a834d7866039fb86f3adf31fbb6093141b78efe9f3838a4577a1569 SHA512 36aca02ee595be426ad85e699dcd4cb6e53c77feb3923a5156bae9fd6047e4a389dd396bd6fdde13d5e82a94bfd1ce9f807965a0746eb7bcaaf2d283c71c3ca1
+EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild
deleted file mode 100644
index 5fc1c3dd3c42..000000000000
--- a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
-HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	>=net-libs/dleyna-core-0.6.0
-	>=net-libs/gssdp-1.2:0=
-	>=net-libs/gupnp-1.2:0=
-	>=net-libs/gupnp-av-0.11.5
-	>=net-libs/libsoup-2.28.2:2.4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gupnp-1.2.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
index 0718496ba1d2..40dfe39201cd 100644
--- a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch
deleted file mode 100644
index ff9725e0f58c..000000000000
--- a/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sat, 16 Mar 2019 05:46:20 +0100
-Subject: [PATCH] Port to gupnp-1.2
-
-gupnp_context_get_host_ip has been deprecated for a long time, as
-the host-ip property moved to gssdp.
-
-There is also a ton of new deprecations but I will address that separately.
----
- configure.ac            | 8 ++++----
- libdleyna/server/upnp.c | 4 ++--
- test/dbus/dms-info.c    | 2 --
- 3 files changed, 6 insertions(+), 8 deletions(-)
- mode change 100755 => 100644 libdleyna/server/upnp.c
- mode change 100755 => 100644 test/dbus/dms-info.c
-
-diff --git a/configure.ac b/configure.ac
-index 11879e7..61f4fca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,10 +36,10 @@ LT_LANG([C])
- 
- # Checks for libraries.
- PKG_PROG_PKG_CONFIG(0.16)
--PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
--PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
--PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2])
--PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.3])
-+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36])
-+PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.36])
-+PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 0.13.2])
-+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 0.20.3])
- PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5])
- PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4])
- PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2])
-diff --git a/libdleyna/server/upnp.c b/libdleyna/server/upnp.c
-old mode 100755
-new mode 100644
-index 9913a76..d04efb8
---- a/libdleyna/server/upnp.c
-+++ b/libdleyna/server/upnp.c
-@@ -351,8 +351,8 @@ static void prv_device_unavailable_cb(GUPnPControlPoint *cp,
- 
- 	udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy);
- 
--	ip_address = gupnp_context_get_host_ip(
--		gupnp_control_point_get_context(cp));
-+	ip_address = gssdp_client_get_host_ip(
-+		GSSDP_CLIENT(gupnp_control_point_get_context(cp)));
- 
- 	if (!udn || !ip_address)
- 		goto on_error;
-diff --git a/test/dbus/dms-info.c b/test/dbus/dms-info.c
-old mode 100755
-new mode 100644
-index a189b9f..4530e58
---- a/test/dbus/dms-info.c
-+++ b/test/dbus/dms-info.c
-@@ -360,8 +360,6 @@ int main(int argc, char *argv[])
- 	if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1)
- 		goto on_error;
- 
--	g_type_init();
--
- 	/* Create proxy for com.intel.dLeynaServer.Manager.  The Manager
- 	object has no properties.  We will create the proxy asynchronously
- 	and use G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES to ensure that
--- 
-2.20.1
-