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

media-plugins/kodi-screensaver-asteroids: bump to 2.3.2, fix cmake build

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

 media-plugins/kodi-screensaver-asteroids/Manifest  |  1 +
 .../kodi-screensaver-asteroids-2.3.2.ebuild        | 44 ++++++++++++++++++++++
 .../kodi-screensaver-asteroids-9999.ebuild         | 31 ++++++++++-----
 3 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest 
b/media-plugins/kodi-screensaver-asteroids/Manifest
index 9b907f82cd3..57ae2bd9527 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,2 +1,3 @@
 DIST kodi-screensaver-asteroids-2.1.0.tar.gz 18838 BLAKE2B 
26504e8a10afed55a780fc18e127df7029adabff913baf4da89e76ebc1ee1bea46431e4a578f8273335a40a30b0bf8e678c86624e75fd3419696c3cb9d494a69
 SHA512 
61d848aa136ab3a9896446d92c5bc8d02867bcdc67b8eed58cff0b9c3573c52a19b4d16de5494dc45c0f69946075749d73e8681858d534f8cbbe31d005a9a5c3
+DIST kodi-screensaver-asteroids-2.3.2.tar.gz 117462 BLAKE2B 
c17837e244baeb65cfef11b8f9a20796922aae19ff48e95baff52163ad2ad44e272e219123ab875ca017a1347d77d07a943991a7822ebcae9e8d96ce881b77db
 SHA512 
1ea720ba96e65e2d63984ece928f40d60eaacd207cfa64979f1fb38e779957bbd91f41df0e0dcb0bad1b3efbb5dd9be17f2a06bcbeb3c06e7a386c07e99d22db
 DIST kodi-screensaver-asteroids-2.4.2.tar.gz 120463 BLAKE2B 
3ec2c8142f8d763e85095f6c89c59583fb0ca309c18a57407fe456113dd8964f6bd896c23fc6d86b9a4d1aacb25e097202e52844faf9272e08d507e50f523ca5
 SHA512 
795c7ef2eaab9e1801d48430b9544a7f721d45ad5aed79ca2e361b16186043dd2ac9dc2b47ddf459744717f4704c9212d23c18df9da6c1bd158e6e6e9ef76fc5

diff --git 
a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.3.2.ebuild
 
b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.3.2.ebuild
new file mode 100644
index 00000000000..27287d27bc2
--- /dev/null
+++ 
b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.3.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="Asteroids screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.asteroids";
+KODI_PLUGIN_NAME="screensaver.asteroids"
+
+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-asteroids/kodi-screensaver-asteroids-9999.ebuild
 
b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
index 4094eae1fd5..16922b419fc 100644
--- 
a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ 
b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -3,31 +3,42 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Asteroids screensaver for Kodi"
 HOMEPAGE="https://github.com/xbmc/screensaver.asteroids";
-SRC_URI=""
+KODI_PLUGIN_NAME="screensaver.asteroids"
 
 case ${PV} in
 9999)
        SRC_URI=""
-       EGIT_REPO_URI="https://github.com/xbmc/screensaver.asteroids.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.asteroids/archive/${PV}-${CODENAME}.tar.gz
 -> ${P}.tar.gz"
-       S="${WORKDIR}/screensaver.asteroids-${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-18*:="
        ;;
 esac
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
 
-DEPEND="
-       ~media-tv/kodi-9999
-       media-libs/glm
-       virtual/opengl"
+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
+}

Reply via email to