From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1196142-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id D7EE6138359
	for <garchives@archives.gentoo.org>; Thu, 13 Aug 2020 20:50:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9978DE092B;
	Thu, 13 Aug 2020 20:50:54 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 75DC6E092B
	for <gentoo-commits@lists.gentoo.org>; Thu, 13 Aug 2020 20:50:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 03B3D34F2FE
	for <gentoo-commits@lists.gentoo.org>; Thu, 13 Aug 2020 20:50:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E3FF328
	for <gentoo-commits@lists.gentoo.org>; Thu, 13 Aug 2020 20:50:50 +0000 (UTC)
From: "Craig Andrews" <candrews@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" <candrews@gentoo.org>
Message-ID: <1597351837.9c26db2f0d686f1bb3b5f22106fe2905f82ce901.candrews@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-visualization-fishbmc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.1.0.ebuild media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild media-plugins/kodi-visualization-fishbmc/metadata.xml
X-VCS-Directories: media-plugins/kodi-visualization-fishbmc/
X-VCS-Committer: candrews
X-VCS-Committer-Name: Craig Andrews
X-VCS-Revision: 9c26db2f0d686f1bb3b5f22106fe2905f82ce901
X-VCS-Branch: master
Date: Thu, 13 Aug 2020 20:50:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b9e41d45-2330-4b63-ac56-fa5750408931
X-Archives-Hash: d52e84050f2a3eabe6c732eb7d6afe8c

commit:     9c26db2f0d686f1bb3b5f22106fe2905f82ce901
Author:     Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Sun Aug  2 08:26:24 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=9c26db2f

media-plugins/kodi-visualization-fishbmc: depends and licence fixes

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

 .../kodi-visualization-fishbmc-5.1.2.ebuild        | 32 ++++++++++++----------
 .../kodi-visualization-fishbmc-6.1.0.ebuild        | 28 ++++++++++---------
 .../kodi-visualization-fishbmc-9999.ebuild         | 28 ++++++++++---------
 .../kodi-visualization-fishbmc/metadata.xml        |  1 -
 4 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
index 61d420f35e1..a874dc3da57 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
@@ -3,41 +3,43 @@
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
-SRC_URI=""
+HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
+KODI_PLUGIN_NAME="visualization.fishbmc"
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.fishbmc.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.fishbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.fishbmc-${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-tv/kodi-18*
+DEPEND+="
+	>=media-libs/glm-0.9.9.8-r1
 	virtual/opengl
-	media-libs/glm
 	"
 
-RDEPEND="
-	${DEPEND}
-	"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	[ -d depends ] && rm -rf depends || die
+	if [ -d depends ]; then rm -rf depends || die; fi
+
 	cmake_src_prepare
 }

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

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

diff --git a/media-plugins/kodi-visualization-fishbmc/metadata.xml b/media-plugins/kodi-visualization-fishbmc/metadata.xml
index a0d45002398..d7211a67058 100644
--- a/media-plugins/kodi-visualization-fishbmc/metadata.xml
+++ b/media-plugins/kodi-visualization-fishbmc/metadata.xml
@@ -5,7 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription>Fische visualizer for Kodi</longdescription>
     <upstream>
         <remote-id type="github">notspiff/visualization.fishbmc</remote-id>
     </upstream>