gentoo resync : 28.04.2021

3 files changed, 45 insertions, 22 deletions

diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 9e36b8c44f15..d3f196206375 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-inputstream-adaptive-2.6.7.tar.gz 748459 BLAKE2B 389525128fb8178d6de2e58d72225bf5a96cbe4f446e190e930aa42afa804c659b35cef281cb8e55c87891f1949087571dac45af218bdb7092680535ff804586 SHA512 60c1f051d50fef21697e6f1e1570bebbaaf3b8f5d4fd207bfdfbd553f1eafb26305af1138c224b2ddfb4ea9c88931991cf46fcbde39b35992ea93884705760c8
-EBUILD kodi-inputstream-adaptive-2.6.7.ebuild 805 BLAKE2B 1dc782e09d1583881228a8010586e7d7e2f2bf0d66f55054c51f1fcc836b9b8760bac8faaa8c1937af8507e82f2de3f1176304b6b8246329ea9154bf98782f3b SHA512 99862aab4b4bca5fcb25881d60c07f7412fcbce0a6402194468d79efccebb8e9d7998af42270b7ba40e17f8cae2ce221bbe1f33415eac17894f60849a97b2837
-EBUILD kodi-inputstream-adaptive-9999.ebuild 876 BLAKE2B 40d3153ecc7418d1c0c4b5406e9ddbefa877aa1ab4d3b63b1223754d4c0630405471e63317843696bd1165175bc74d41e3156c89e13fabd72e0372118cb562c7 SHA512 9458947596c7edee381a5d27d105277506f04ac5472c9f2c4e0cee25a46034955ed9164466571a9b04d54e37482f3ec74346b98389f2154870a7f11dbaf5255b
+DIST kodi-inputstream-adaptive-2.6.14.tar.gz 750124 BLAKE2B 0a00ed8ef5351877077a85b1952464223bfeed688ac28015222a3f415128c2a46e0927be2970ef01c8215ca471c7a91a24cfbbe3d202cefd106768be8d6af33a SHA512 469e685f0b00739de4e609c6f5bc099f4079fccb629221fa12d17da641a4daddc9ad1ea1a268d1bb3a1efb4704366b2a938e51749cc57d6188d5e7628a79d010
+EBUILD kodi-inputstream-adaptive-2.6.14.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
+EBUILD kodi-inputstream-adaptive-9999.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
 MISC metadata.xml 370 BLAKE2B 3cb26d2c0afe08e8bfd5d0074439528252d30a4d46952f48ead0f06e959f29dae992be1410aee15b62b4daae154c2973ddd5278e0515cb25221955c9d5f35593 SHA512 41ea83a2731d3a135075842b41bab398acb3f2c9c8c0bd6c589e00669eea8b9e23bd3dd71b3be8cac954138259a91eeffa4eddbaab3774b8750531b63999e1f3
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.14.ebuild
index 48e18f09b005..eb913a08d263 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.7.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.6.14.ebuild
@@ -26,17 +26,29 @@ esac
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+RESTRICT="!test? ( test )"
+IUSE="test"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/expat
 	=media-tv/kodi-19*
 	"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+	"
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	"
 
 src_prepare() {
 	[ -d depends ] && rm -rf depends || die
 	cmake_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
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 18e80d341a6d..eb913a08d263 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,43 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's Adaptive inputstream addon"
 HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-KODI_PLUGIN_NAME="inputstream.adaptive"
+SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/${KODI_PLUGIN_NAME}.git"
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
 	EGIT_BRANCH="Matrix"
 	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Matrix"
 	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-19*:="
+	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+"
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+RESTRICT="!test? ( test )"
+IUSE="test"
 
-DEPEND+="
+COMMON_DEPEND="
 	dev-libs/expat
+	=media-tv/kodi-19*
+	"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+	"
+RDEPEND="
+	${COMMON_DEPEND}
 	"
-
-RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
+	[ -d depends ] && rm -rf depends || die
 	cmake_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}