gentoo (leap year) resync : 29.02.2020

4 files changed, 120 insertions, 3 deletions

diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 3b1be210bd75..e621becc7c5d 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,4 +1,7 @@
+AUX 0.6.0-gupnp-1.2.patch 2449 BLAKE2B 25aba7b48ef6dfef1d1dbe1c229fefc8c395c8ab1b393a49b6382662437137f628a7e4565aff701331375aae89fbdc3d6b8408d606694ca540036eb87743415b SHA512 9f0ba14980cb9238b576f40802c11e718a42576fd5f33fabf0ff4a2be186533bc6113ae88f1d554894d2205b7824a3a83f7fb99b43559a1c0add8ee07c8adf48
 AUX dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch 285 BLAKE2B 5425885163b4df90ec99ff0756d1d1da0b0336a73790f1f1c3e7c2ed40b51c78752705a229313d4e35503f62acd3d521026cc7553c154f35c464de5fe53dcf48 SHA512 76df25eac5b3b0d726089e98c38d8280bf3a72dfa830381f3b6a9a31df10abe31cc53c64e75f2fb12901130f243377392c607129821ca7645929ec2696bd88e4
 DIST dleyna-server-0.5.0.tar.gz 412938 BLAKE2B 532e1a418708d84dabd98670d84c865b6f69252cbd851504bd2d75bbbf683b699a47513a6ae994f809f3993a67815d5a3ee53683a016448c76d604fed040aceb SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398
-EBUILD dleyna-server-0.5.0.ebuild 877 BLAKE2B 78cc1ef9d19ed88df304ad41faf6fd4de87d14358b516d66ee32a77d6bfc9438970e934c1c2f5a6ba13b2156db9316416077bdc0fe823a3bb90a1e6b70f991c1 SHA512 219e65f5e4de35e016920cfbd12078310fd569cb7bed952ea1623508190a86a1baca3a5917a9f70c255a212d23228118ff7e057f606b2780343e0522184eea2f
+DIST dleyna-server-0.6.0.tar.gz 107573 BLAKE2B c2460d20ac12d377170fc1292efa48ccec218b7c8e6f2d463a159bda801a7e9a5cfd239e51bcf9d997124a0a9ff305f3a4047228d54a55b26407fb1e37b2e238 SHA512 5fecc48f72afdac46da04d1785cf49384ed84b078802e4703cd86dc8e2c5db64df0232f66b73c73b3f358f7248117cd00fa4652397619d87f8f4a305e047306c
+EBUILD dleyna-server-0.5.0.ebuild 885 BLAKE2B 9ae97dc70d8a4925a1f388ce79e001d946333bd8d0f0b96e8a9e9029ef5ac59bedef3c6a28088edc29cf265f6f75d49622d410df46b5160350769f2a60ab0a14 SHA512 c3c68d394a3ff2640d7cdf3c86b5a90756c92a7df5368fdc737682a417ab43f6b547d6801642520fb4654c5d8f94ec3031a3a8bbc6649160c5a6b6e19bca452d
+EBUILD dleyna-server-0.6.0.ebuild 843 BLAKE2B 284fa7d88caef61d192ceddbaffdd4a9937d55afff94eb4a3d94374110d0af8438da97deee61ce521fee0d8be4ca324499a2824da0186fc5f98a5696efa6a0bf SHA512 9e5d5d7997df003e47f6db7b42f7a47e111478d4a5bd445c4a0493bf2e4805b94a6906147d342624e3a537ad53af02ae0070434ac99c152f6c00ef2ccb8409f2
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
index 72f80642cf90..658b58777b19 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -19,8 +19,8 @@ RDEPEND="
 	dev-libs/libxml2
 	>=media-libs/gupnp-dlna-0.9.4:2.0
 	>=net-libs/dleyna-core-0.5
-	>=net-libs/gssdp-0.13.2
-	>=net-libs/gupnp-0.20.3
+	>=net-libs/gssdp-0.13.2:0/3
+	>=net-libs/gupnp-0.20.3:0/4
 	>=net-libs/gupnp-av-0.11.5
 	>=net-libs/libsoup-2.28.2:2.4
 "
diff --git a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild
new file mode 100644
index 000000000000..d0e3df56827f
--- /dev/null
+++ b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild
@@ -0,0 +1,43 @@
+# 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/files/0.6.0-gupnp-1.2.patch b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch
new file mode 100644
index 000000000000..ff9725e0f58c
--- /dev/null
+++ b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch
@@ -0,0 +1,71 @@
+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
+