[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-screensaver-pingpong/

["Craig Andrews" <candrews@gentoo.org>]

commit:     1883051759b2772a395477820c65c71a64797b2b
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Tue Jul 28 11:25:10 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 20:50:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18830517

media-plugins/kodi-screensaver-pingpong: bump to 2.1.2, fixed cmake build

Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/16883
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-plugins/kodi-screensaver-pingpong/Manifest   |  1 +
 .../kodi-screensaver-pingpong-2.1.2.ebuild         | 44 ++++++++++++++++++++++
 .../kodi-screensaver-pingpong-9999.ebuild          | 29 +++++++++-----
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index 87ccc26f88e..3a6b4259e2d 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -1,3 +1,4 @@
 DIST kodi-screensaver-pingpong-1.1.0.tar.gz 14476 BLAKE2B ce9a13968394ff607beff2fec8ea8b2e17a8bf7b08cd7be12af426dc45c100a666fb104a5cfa05287b6e632cf51d7d27b6d504d481fb4b6ae85066ddb179be08 SHA512 304bb57cb4d5a9807ced12ad1503f7a1be0f57b2ccc8a024651dcdba83ee17fb1b3adde1799b62d41c0ad2fc75ec0757dc06492c9b3adb5b89e6ef77a63856b7
 DIST kodi-screensaver-pingpong-2.0.0.tar.gz 16768 BLAKE2B 1b4864ae3b88245733dec758cd815ff7a9f4673e1ab249275239c4ac1cdf04fbd256001d5ee984bd509730094b91cfe1d2e683169624f87192dbebcd4dc98f74 SHA512 c754b38a549589488e524e6b61088b3d9afe8f2f76bd65aa72901c7004880087cc7cb614f4b1cde49b0200a11f2f57181be913523a8b339abb6c26589a6a3d39
+DIST kodi-screensaver-pingpong-2.1.2.tar.gz 23187 BLAKE2B eca285634708491d2a9ae4a00bc203b99b8d13c38e7c852060e9f4b89907c01204f231769558e7111a6c1700a48f7a78add0dfbb388bbe56cad9dcd589816f8d SHA512 d7a1b316920a4ecea88462c6ade886f8bebf35d4b2be7108eca8fc929838c01b02a1f7cc1dce5ce89f677e84cea7cdd7eb259cc23fb70b6760bf2eb57d6a9e5d
 DIST kodi-screensaver-pingpong-2.2.2.tar.gz 25546 BLAKE2B b396f1e7e167c46b1acc49587b25bbb95b7310b5f10ec4a35daeaa752cd65fc3919811453c5be0b93ac807b6775db27f4f4be9be1183766eabe287e4b1b16a16 SHA512 bf7df6298a182479c676434ec23a20c120e2483a921ed7bc059f0712d7b0e1a8e97e2c140205a243321eef755cfb6e346aba9122924b59dea29ff386a94173ee

diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.1.2.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.1.2.ebuild
new file mode 100644
index 00000000000..4ed074531ad
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Ping-pong screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
+KODI_PLUGIN_NAME="screensaver.pingpong"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${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+="
+	>=media-libs/glm-0.9.9.8-r1
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}

diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
index cd8a1082b48..5046bcdc53f 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -3,32 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Ping-pong screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
-SRC_URI=""
+KODI_PLUGIN_NAME="screensaver.pingpong"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pingpong.git"
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
 	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
 	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/screensaver.pingpong/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pingpong-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/xbmc/${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="
-	~media-tv/kodi-9999
-	media-libs/glm
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
 	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}