gentoo resync : 25.08.2020

4 files changed, 103 insertions, 15 deletions

diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 4af20e1f90c9..e3a2cd438668 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,6 +1,9 @@
 DIST kodi-inputstream-adaptive-2.4.4.tar.gz 727535 BLAKE2B fac4034f3333e01951ad592e16cb4f7978cbfb96bf7b7492d8d80c663e7a95a14647a5d68bd32a97c7a4550428359561bbb4a880544f9b76ebdb17fe829d706b SHA512 5ddc8ee08144f43369d807b1a8a2b1fc2fa70a3a0063be09a47d1df021442f0a7fb46acf2399e458bb807429f38abe9bdea5b4994ab58f93f07214b330e150f2
 DIST kodi-inputstream-adaptive-2.4.5.tar.gz 731621 BLAKE2B 8f644efcce0268833fc0688ea291558e9eaf3b0732656e865299f39cfb5cf3c51cd5dc460139fd457c83bdcaa065be916794886fbc75225d2a8eef87249147b2 SHA512 b38e175fb21dcc155aa5b5cda4ffdbd26336a763c9ecf8857058352a3a8f6d9a617a4999f6aed1bee4edd97d18e7a1f4e4a2318cdf871982415e7dd2b519f498
+DIST kodi-inputstream-adaptive-2.6.0.tar.gz 731726 BLAKE2B ab0c39e936cf80069753293fd93e0bfcc1d952c05a43402cb0b351003130738da3cfa6a98970d7eab5abd1e2224e3402f947c260789d967fa7f5459e243e1c08 SHA512 2c9f61831a7a8e3ba33438d00b5a9611fa643bb296b209fcf68fdec129c6f6d38b2cd6cbb383472187122b983d794519eab68b7e948275f98e9deddce3763eb0
 EBUILD kodi-inputstream-adaptive-2.4.4.ebuild 765 BLAKE2B 71c04c5948acfc0f891ca14c69aa7e1d13d5ca99bcd9485c159362b2b193d9f552c95c198b8673d79fd1797503ec709b9775f2727efd1997af9a87dce318686a SHA512 d4d91d410b73613bd19095dff69d36dd127b45bf7a2977f90fa634525a2b95e5d88b42610995685c99311bbcc27f37cb064984aa7103e5aa4ee99e5f618fdf39
+EBUILD kodi-inputstream-adaptive-2.4.5-r1.ebuild 874 BLAKE2B 369b9343c46080c24cf1bde3b56dfa0a9aa084e68dd615e6638f1b26e0464ea7474880969551c4011314dc3ab3cb4415ce5affa35c21f59c615b69cd2e17ff27 SHA512 6712ba9713dd12e08ffc64468a8145bf6c5d5a4d2c8e78c1c491064b8d36c46cd730c51e5747eed9592fc6ca0371730966c163116e7d9f4f94de795069c58952
 EBUILD kodi-inputstream-adaptive-2.4.5.ebuild 765 BLAKE2B 71c04c5948acfc0f891ca14c69aa7e1d13d5ca99bcd9485c159362b2b193d9f552c95c198b8673d79fd1797503ec709b9775f2727efd1997af9a87dce318686a SHA512 d4d91d410b73613bd19095dff69d36dd127b45bf7a2977f90fa634525a2b95e5d88b42610995685c99311bbcc27f37cb064984aa7103e5aa4ee99e5f618fdf39
-EBUILD kodi-inputstream-adaptive-9999.ebuild 836 BLAKE2B edf07ed61ef0e7ebb3e0a5d9210ce390cfa78a4e14beeb69164b7e921ef3fbb2407f564bfe5c3df12b13cd1b9a1bdbbe573ed8d212cc23f16a10b02ae6e78559 SHA512 8390ae7d060df1c33655e53a90309194911575fbabbc04a168151a0ea06cf1e70f43283103574893690f06c8a5843f6f8104f2338c634f2f416cab5cc9f21996
+EBUILD kodi-inputstream-adaptive-2.6.0.ebuild 805 BLAKE2B 71bcc875bb24adedb30fc8c187b52ac393b9faf613b9a3a18a81b63ccb6443f7445a6e9d9ff8607bb5fd603d7762bd52cfeed4abf2e9b8401a116f75afb64612 SHA512 9ce95379f2e314b1d8f2ff38c8006baa75c4b55f91ebe46bd4db2818faf1b8e4951f4e8f6e960b3687cb1e3a9c19188102d291fdcb82469cfdc385b23272e8f3
+EBUILD kodi-inputstream-adaptive-9999.ebuild 876 BLAKE2B 40d3153ecc7418d1c0c4b5406e9ddbefa877aa1ab4d3b63b1223754d4c0630405471e63317843696bd1165175bc74d41e3156c89e13fabd72e0372118cb562c7 SHA512 9458947596c7edee381a5d27d105277506f04ac5472c9f2c4e0cee25a46034955ed9164466571a9b04d54e37482f3ec74346b98389f2154870a7f11dbaf5255b
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5-r1.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5-r1.ebuild
new file mode 100644
index 000000000000..1185349b60ef
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+KODI_PLUGIN_NAME="inputstream.adaptive"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-18*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	dev-libs/expat
+	"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.0.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.0.ebuild
new file mode 100644
index 000000000000..e11b1e51347b
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
index 288d61ebc27b..18e80d341a6d 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -3,41 +3,41 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Kodi's Adaptive inputstream addon"
 HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
+KODI_PLUGIN_NAME="inputstream.adaptive"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"
 	EGIT_BRANCH="Matrix"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
+DEPEND+="
 	dev-libs/expat
-	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
-	"
-RDEPEND="
-	${DEPEND}
 	"
 
+RDEPEND="${DEPEND}"
+
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }