gentoo (leap year) resync : 29.02.2020

4 files changed, 116 insertions, 2 deletions

diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
index 4edf7efa455d..5a96e3eabf56 100644
--- a/net-libs/dleyna-core/Manifest
+++ b/net-libs/dleyna-core/Manifest
@@ -1,3 +1,6 @@
+AUX 0.6.0-gupnp-1.2.patch 2499 BLAKE2B 70528c690f684bc14ee39c256fa315407628f9aa7303cfc5489bc6868cb774df440ede747f59e4a1f37fb322db0403132eff62f258855548b819a733c6c4db21 SHA512 b0bb51867e07068abdde71ba68d5a8a56fde832976496a8f93035b012f5c65417b7bd875566408d401803534943e80a9ac48275b4f025a59f39ecaea0393faf2
 DIST dleyna-core-0.5.0.tar.gz 337307 BLAKE2B fc2b342d1cfd3b132f10bea55b386f7fc0fb31cb541272c5cc002c985b2830c9ac425c497feeb62ebc2bdad76d91f9123408dbd00b24080d1a3b1902e8743727 SHA512 8611ae61482dcb0ca55513ed4ce7cae9372f88d710033e5abbaeb3c06533a7b2ac143757776bf9ced0dd3f0149ee9f2e42e90fac3ecbbeb42f38d13aeae7849f
-EBUILD dleyna-core-0.5.0.ebuild 531 BLAKE2B a4d984f3e90a1acf84144c310483dbc2a2af89b0c07005ef2cf2e4cfa2fb970f9479c5ab2655779643ef72ed553b3aff8f6b518349f599ecb4569af037537a1e SHA512 f13ad1176efc8ca66a28c77d781d4a20bf52378257f676b0ec91a38191efce21a19685202dc1590c2c8f4fb72ba27a3d94a66de573644e51a99797960d2c22e5
+DIST dleyna-core-0.6.0.tar.gz 30821 BLAKE2B f97ef825ef28efd58877487074c0146f8c8425b000537a2281ab44465829030ba9b837f95ad16b56044837a3e571a0ce54a8126ddafc2dda551dbf1d8b11a79e SHA512 cda3f3ee2bea860b06447ab79d8ca62a29c8d26215774c44adb05e57316b95acd4df6ee4ecdd731574b6da5b3aef1c08977a649288004a62a88af38a83157b57
+EBUILD dleyna-core-0.5.0.ebuild 535 BLAKE2B 3d2379127ad4b6d79b666822f1761c2da5689c41a9d2de43ad89c9c98ee45b98735c2386692623f8a7bd312c9e25897d0ad68eadd5c6edb7c6ae310106d3c991 SHA512 06077ab0daed7261b0fc4a33101b1b9eec748cbede503c78194aa914b98de47dcd69d43f728ce1448280f692e3f42980e77418abaa0a14124cce24c35b651ee3
+EBUILD dleyna-core-0.6.0.ebuild 670 BLAKE2B 7eea5157042c64aedd7349c3f5b30432f65b4857e5ba3d05d2aca09c6d0ededcbd1d1e7b144d967e3b081ca0fabb11ced61fb728e77b7523bbc3c411225c4386 SHA512 a436bfcead55112a25a5c3852029222dc0ff43c279c8a4e4d559e644a0b08b6a099a3a69da9565367a0e3789602f1a85d8305c1ac071a3b34f093f05d5fc8744
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
index e8969cb21f79..5679380a109b 100644
--- a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
-	>=net-libs/gupnp-0.20.5
+	>=net-libs/gupnp-0.20.5:0/4
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
new file mode 100644
index 000000000000..d60cf90fb902
--- /dev/null
+++ b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="utility library for higher level dLeyna libraries"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_3.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0/4"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/gupnp-1.2.0:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch b/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
new file mode 100644
index 000000000000..71eef9f37b37
--- /dev/null
+++ b/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
@@ -0,0 +1,73 @@
+From 41b2e56f67b6fc9c8c256b86957d281644b9b846 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Sat, 16 Mar 2019 05:39:38 +0100
+Subject: [PATCH] Port to gupnp-1.2
+
+The latest version of gupnp breaks backwards compatibility. Fortunately,
+there are not many calls to gupnp functions in core, so we just needed
+to bump the dependencies.
+
+There is one deprecated gupnp_service_proxy_cancel_action call but
+I am not sure how to change it without breaking Dleyna API.
+Let's leave it for now.
+---
+ configure.ac                  | 2 +-
+ dleyna-core-1.0.pc.in         | 2 +-
+ libdleyna/core/main-loop.c    | 4 ----
+ libdleyna/core/service-task.c | 1 +
+ 4 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a96c84..9f769e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,7 @@ 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([GMODULE], [gmodule-2.0 >= 2.28])
+-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5])
++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h syslog.h])
+diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in
+index 966a8e1..52b718e 100644
+--- a/dleyna-core-1.0.pc.in
++++ b/dleyna-core-1.0.pc.in
+@@ -8,5 +8,5 @@ Name: @PACKAGE@
+ Description: UPnP & DLNA core library
+ Libs: -L${libdir} -ldleyna-core-1.0
+ Cflags: -I${includedir}/dleyna-1.0
+-Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.0
++Requires: glib-2.0 gio-2.0 gmodule-2.0 gupnp-1.2
+ Version: @VERSION@
+diff --git a/libdleyna/core/main-loop.c b/libdleyna/core/main-loop.c
+index 3642a5b..9716b06 100644
+--- a/libdleyna/core/main-loop.c
++++ b/libdleyna/core/main-loop.c
+@@ -128,10 +128,6 @@ int dleyna_main_loop_start(const char *server,
+ {
+ 	int retval = 1;
+ 
+-#if !GLIB_CHECK_VERSION(2, 35, 0)
+-	g_type_init();
+-#endif
+-
+ 	dleyna_log_init(server, control_point->get_version());
+ 
+ 	if (!prv_context_init(server, control_point))
+diff --git a/libdleyna/core/service-task.c b/libdleyna/core/service-task.c
+index e0ca2df..fb113c3 100644
+--- a/libdleyna/core/service-task.c
++++ b/libdleyna/core/service-task.c
+@@ -103,6 +103,7 @@ void dleyna_service_task_cancel_cb(dleyna_task_atom_t *atom, gpointer user_data)
+ 
+ 	if (task->p_action) {
+ 		if (task->proxy)
++			// TODO: switch to GCancellable
+ 			gupnp_service_proxy_cancel_action(task->proxy,
+ 							  task->p_action);
+ 		task->p_action = NULL;
+-- 
+2.20.1
+