commit: 1159a629817ea029495285ae0ea064726c25e7e0 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Sun Aug 2 09:30:37 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Thu Aug 13 20:50:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1159a629
media-plugins/kodi-visualization-goom: fixed deps, licence Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/16947 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../kodi-visualization-goom-2.2.1-r1.ebuild | 35 +++++++++++++--------- .../kodi-visualization-goom-9999.ebuild | 35 +++++++++++++--------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild index 97a386c15cd..842215df320 100644 --- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild +++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.2.1-r1.ebuild @@ -3,36 +3,43 @@ EAPI=7 -inherit cmake kodi-addon +inherit kodi-addon DESCRIPTION="Goom visualizer for Kodi" -HOMEPAGE="https://github.com/notspiff/visualization.goom"; -SRC_URI="" +HOMEPAGE="https://github.com/xbmc/visualization.goom"; +KODI_PLUGIN_NAME="visualization.goom" case ${PV} in 9999) SRC_URI="" - EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.git"; + EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"; inherit git-r3 + DEPEND="~media-tv/kodi-9999" ;; *) - KEYWORDS="~amd64 ~x86" CODENAME="Leia" - SRC_URI="https://github.com/notspiff/visualization.goom/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/visualization.goom-${PV}-${CODENAME}" + 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" +LICENSE="GPL-2+" SLOT="0" IUSE="" -DEPEND=" - media-libs/glm - =media-tv/kodi-18* +DEPEND+=" + >=media-libs/glm-0.9.9.8-r1 virtual/opengl " -RDEPEND=" - ${DEPEND} - " +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-visualization-goom/kodi-visualization-goom-9999.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild index 39f82f9aaa1..342c6ca80b1 100644 --- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild +++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild @@ -3,36 +3,43 @@ EAPI=7 -inherit cmake kodi-addon +inherit kodi-addon DESCRIPTION="Goom visualizer for Kodi" -HOMEPAGE="https://github.com/notspiff/visualization.goom"; -SRC_URI="" +HOMEPAGE="https://github.com/xbmc/visualization.goom"; +KODI_PLUGIN_NAME="visualization.goom" case ${PV} in 9999) SRC_URI="" - EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.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" - CODENAME="Leia" - SRC_URI="https://github.com/notspiff/visualization.goom/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/visualization.goom-${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-libs/glm - ~media-tv/kodi-9999 +DEPEND+=" + >=media-libs/glm-0.9.9.8-r1 virtual/opengl " -RDEPEND=" - ${DEPEND} - " +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +src_prepare() { + if [ -d depends ]; then rm -rf depends || die; fi + + cmake_src_prepare +}
