gentoo resync : 08.09.2019

4 files changed, 98 insertions, 2 deletions

diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index 7ccee1161f3f..d2f0c8aff04b 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,6 +1,8 @@
+AUX kodi-pvr-vdr-vnsi-3.6.3-remove-kodi-platform.patch 1916 BLAKE2B 70b5129fedae5711723853678f156ab79f839d039be3470860871227f9c2838efc370566677eb778992abd11aee2e312719875b2f69f18f4bedb366eee554adf SHA512 2ffd7ae78297651ae264bfec6b70b0c59e6ff5bd2393402ebf55c2f29e0d65d783d5f88c0b06bf8c9543682317432310388e46fd31c2101fac2ed840f6b747a0
 DIST kodi-pvr-vdr-vnsi-3.6.2.tar.gz 145275 BLAKE2B 40f1f21b80411c772b093a4a117522b31d93d3bc87d876154f46cfa58781e56e10d92e0dc67ca40be07a8e3e2b7c1c0a9716bd7a9b81ff21601b921b5a21f343 SHA512 ed76ba60188f513a6c43b21985522cb5e8eb8da3ffdf35ee88e95cec94c078cfc322c2e267a8837626c60242082bd61214c9ec26bff844967ce9f28f1cf885f8
 DIST kodi-pvr-vdr-vnsi-3.6.3.tar.gz 146568 BLAKE2B 375cacf90a8a7fa430f7b06a12397293df3d5aff07ce5c5fc254440bbb2a2b6f3f4e0b49687dd81a069a76801fc6ede3adcca9de11a126bb6ddae9ed7c35f4f4 SHA512 8f060373c43493ccde0e3d199470fcbf9c6e33f0457f31eb64bab4dde06e6cdbce5de0cefc9018aa7d35d8608d74fdf0f2f6e5e2b8d0a741683fa2091b4fe954
 EBUILD kodi-pvr-vdr-vnsi-3.6.2.ebuild 665 BLAKE2B 549c00829a828235bac2455a2f62aada5733940bf13a5cbc02c373cc61c9a4998e13849744b81b1f880a627d528c0d04f5eaabce8b9946043fd560ed92c66df5 SHA512 fb1cb4333073c7b9fee9e7919e975f85f75206e80877c76e6793310283be36ab591cf1054c1f20ecb0d184ef99b860263c749e1e29aeaebe64a3e62ec1e74b5a
+EBUILD kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild 751 BLAKE2B 0a5e074ff4f1494286b71d206c2c8b73de7b0f5691563b10fc80ab4b76d8fcad2e6eae022013c1c300845d14645f52b17352461386c48e40bbfe9c88a283babd SHA512 3f9e0bb8408b01e65921cb4c4e7bb5cc36131edaa15a38cae98cd8c0597199237f46e802151fcf5fd8342487370ca5ac566b7ce8f4637aa191c5689c64bada20
 EBUILD kodi-pvr-vdr-vnsi-3.6.3.ebuild 696 BLAKE2B 616070d579738d34d9f4349642e14792433904b0cf3ab7f826b6c5fda9e29b7007eb4dcbd1854973988afe84cf49dbccd77041600d6686889f1ccb0757c68ca6 SHA512 bdb1549c09488af7b71a8af6e116603eba7c6169ae010d6a505df8451be70cfb4876b0af41ec150084c612b6b200080622b7b923c86e8e22da3fe50cd2d3fa4b
-EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 698 BLAKE2B 8cfd7a0c01597c946c11a169a5c8ddda0284ab949a4ef83494b7e5e54d4f0df32ae1491d4e6284c40b502d02672da24ad1e0012c9248f454c2e1b3ebfae40634 SHA512 ebdd798ccfc8cffe021cca650a355de67b257cad563b32abc3aeda0cd256355c34b3c7892316707c02e529fda6f14efa3403b005e3608b72587d8a8816686d30
+EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 692 BLAKE2B add62c1fc30da7b3d266462b182d784bfa71f8689ac8c7db95213fbeb46901086c72671581d2e0d69257df1b0a953c9ab3fd494d77a86c357d0af2f1b665b53a SHA512 74a5d74f8019176e854626c1bc8fb677282bf9cd9b1764b3b6dc21ed87156cb6d80deaae74bd80af0844bc1c2a54f329fb5b6b53869b5825c838e7cdf39b25c4
 MISC metadata.xml 423 BLAKE2B ff5a21d61f4516f52b4a139f695048b1483aca09426e249c3165ecfbdef8770a47bd98d4bbea582e06e21c8d508884f67389d69ad126a3c7d46de1bce2b48207 SHA512 e81e80ae101dbd4b405ff3b8056c8cc901d5fcf2ff2d1eb595e26f5f59954d6931c5acce9fadb94bfbb533865017f17fb579bf382ce6c226ca32a2dc10f1e0a8
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/files/kodi-pvr-vdr-vnsi-3.6.3-remove-kodi-platform.patch b/media-plugins/kodi-pvr-vdr-vnsi/files/kodi-pvr-vdr-vnsi-3.6.3-remove-kodi-platform.patch
new file mode 100644
index 000000000000..1059d5a62640
--- /dev/null
+++ b/media-plugins/kodi-pvr-vdr-vnsi/files/kodi-pvr-vdr-vnsi-3.6.3-remove-kodi-platform.patch
@@ -0,0 +1,52 @@
+https://github.com/kodi-pvr/pvr.vdr.vnsi/pull/123
+
+From 7a19dc72df0a299887d08b27973de599dfc39f9e Mon Sep 17 00:00:00 2001
+From: Olaf Hering <olaf@aepfle.de>
+Date: Thu, 2 May 2019 13:33:41 +0200
+Subject: [PATCH] [cmake] remove usage of kodi-platform
+
+The pvr.vdr.vnsi binary addon does not use kodi-platform.
+Remove existing references from CMakeLists.txt and debian/control.
+Add dependency to libp8-platform-dev because libkodiplatform-dev
+pulled that dependency in as a side effect. Fix that bug too by
+adding an explicit dependency.
+
+Signed-off-by: Olaf Hering <olaf@aepfle.de>
+---
+ CMakeLists.txt | 2 --
+ debian/control | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb35dc1..356d4f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,6 @@ project(pvr.vdr.vnsi)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
+ 
+ find_package(Kodi REQUIRED)
+-find_package(kodiplatform REQUIRED)
+ find_package(p8-platform REQUIRED)
+ 
+ add_definitions(-DUSE_DEMUX)
+@@ -78,7 +77,6 @@ endif()
+ message(STATUS "Configured render system: ${APP_RENDER_SYSTEM}")
+ 
+ include_directories(${INCLUDES}
+-                    ${kodiplatform_INCLUDE_DIRS}
+                     ${p8-platform_INCLUDE_DIRS}
+                     ${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
+ 
+diff --git a/debian/control b/debian/control
+index 45fa8d8..1f0ae38 100644
+--- a/debian/control
++++ b/debian/control
+@@ -2,7 +2,7 @@ Source: kodi-pvr-vdr-vnsi
+ Priority: extra
+ Maintainer: fernetmenta <fernetmenta@kodi.tv>
+ Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev,
+-               libkodiplatform-dev (>= 17.1.0), kodi-addon-dev,
++               libp8-platform-dev, kodi-addon-dev,
+                libgles2-mesa-dev [arm], libgl1-mesa-dev [i386 amd64], pkg-config
+ Standards-Version: 3.9.4
+ Section: libs
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
new file mode 100644
index 000000000000..ec16e30ef479
--- /dev/null
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi PVR addon VNSI"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-tv/kodi-18*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-kodi-platform.patch"
+)
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
index 565b26fff2a0..1109235bfe77 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
+	=dev-libs/libplatform-2*
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	virtual/opengl
 	"