gentoo resync : 31.05.2021

4 files changed, 2 insertions, 116 deletions

diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
index fb672b34a225..ed777d1c16a4 100644
--- a/net-libs/dleyna-core/Manifest
+++ b/net-libs/dleyna-core/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6.0-gupnp-1.2.patch 2499 BLAKE2B 70528c690f684bc14ee39c256fa315407628f9aa7303cfc5489bc6868cb774df440ede747f59e4a1f37fb322db0403132eff62f258855548b819a733c6c4db21 SHA512 b0bb51867e07068abdde71ba68d5a8a56fde832976496a8f93035b012f5c65417b7bd875566408d401803534943e80a9ac48275b4f025a59f39ecaea0393faf2
-DIST dleyna-core-0.6.0.tar.gz 30821 BLAKE2B f97ef825ef28efd58877487074c0146f8c8425b000537a2281ab44465829030ba9b837f95ad16b56044837a3e571a0ce54a8126ddafc2dda551dbf1d8b11a79e SHA512 cda3f3ee2bea860b06447ab79d8ca62a29c8d26215774c44adb05e57316b95acd4df6ee4ecdd731574b6da5b3aef1c08977a649288004a62a88af38a83157b57
 DIST dleyna-core-0.7.0.tar.gz 28354 BLAKE2B cfc21da2be908701ffe87f653ddbb3e8241f3842031987de9a0615ccc5dcd4f2180aaf9caaf981c6421d9cbfdc4cecb359998988f13f48ac5a5696bf56d7ae79 SHA512 02509d2fc386bc1d7f9295df7a12315a664a9dc4cced871da193dc79e15c3291ad4497cd18c655a7eb3e4d865a6448526c6abc1df2dc086cb7fc94f44c09b7f0
-EBUILD dleyna-core-0.6.0.ebuild 668 BLAKE2B b05d36f6c169d9fc68410241948844d1ea23be45009564e40b0ce88bc5b6455e97e9a290ec48c83ea95705bc4f3d5fe37f7fca706bbfd1f0b798a747bd14e4b8 SHA512 5d903a4aadee9e075903d75f0a4aba11beaced0ea7a5d03120fddc08b321175640785e5b0a6b3848cac1a81e26b5c0471ae17556b69df49f894eb4d6cc43e5dc
-EBUILD dleyna-core-0.7.0.ebuild 540 BLAKE2B 7c628c600a2b681240ede1223ea25c6137d06207599302191e7b2e3774b6ad3ed13894f691ad1d6616347a4e4bc361a5ce88e115083c6e6bad2344fa5c6d7b28 SHA512 19a3883f558eb31d0ec02acf9cac22d1db4a78941d655081a81b268817c183a481263b09e95da6a0698936cbcc1dbe23fbabdef0f0ae727a0bbcb3048f1103a7
+EBUILD dleyna-core-0.7.0.ebuild 538 BLAKE2B a84e6d7cb7a0c55427d018b643344113fc9eec3f7b4af40cafccc97819bdecea34c31eb09f25ee91674d9e9a9cda2a6ea8e7fa0bf2d46a70d503e7b2e6590858 SHA512 02c87c2c2c12dc50e089d11b3cfdc828daca28ad326fdedaa321d245040b70a51e5f764af6fae5ada942ad6fa6a1cd6702c243d5e93e6c83bee382de539643c4
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
deleted file mode 100644
index 14d487b56a91..000000000000
--- a/net-libs/dleyna-core/dleyna-core-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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/dleyna-core-0.7.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
index 119dfa74760a..d03a1e54e96f 100644
--- a/net-libs/dleyna-core/dleyna-core-0.7.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-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="1.0/5" # soname of libdleyna-core-1.0.so
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
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
deleted file mode 100644
index 71eef9f37b37..000000000000
--- a/net-libs/dleyna-core/files/0.6.0-gupnp-1.2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
-