[gentoo-commits] repo/gentoo:master commit in: media-plugins/banshee-community-extensions/

[Michał Górny]

commit:     55e2147aaed812505f9dfe82e6a0777c053e28c4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 06:20:15 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 06:25:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e2147a

media-plugins/banshee-*: Disable exts needing banshee[web], #587456

Disable the extensions using Banshee.WebBrowser
(media-sound/banshee[web]) since the support for that module has been
removed due to vulnerabilities in required WebKit.

Bug: https://bugs.gentoo.org/587456
Fixes: fdb83931178 (media-sound/banshee: Drop old)

 .../banshee-community-extensions/Manifest          |  1 -
 .../banshee-community-extensions-2.2.0.ebuild      | 79 ---------------------
 ...> banshee-community-extensions-2.4.0-r2.ebuild} | 14 ++--
 .../banshee-community-extensions-2.4.0.ebuild      | 80 ----------------------
 .../banshee-community-extensions/metadata.xml      |  2 -
 5 files changed, 7 insertions(+), 169 deletions(-)

diff --git a/media-plugins/banshee-community-extensions/Manifest b/media-plugins/banshee-community-extensions/Manifest
index da769d9..391f77d 100644
--- a/media-plugins/banshee-community-extensions/Manifest
+++ b/media-plugins/banshee-community-extensions/Manifest
@@ -1,2 +1 @@
-DIST banshee-community-extensions-2.2.0.tar.bz2 858373 SHA256 3ac0c7e9e00b8ab7b91a8942cb5b1fc360977b15ec303756d4a440704a22bb15 SHA512 7b130d69639bd9fca28d5320abf7c742e687ecf049711ac68230355a85faa5570ba349e6163ca982e9b24519e2224e1f2fb07ca6686cbf1c73a7e3cccf2e0598 WHIRLPOOL e5898414f75321847c6c487a3d8b3282fde77a6dc7c74812b75428266b8ea44c1510ad25e9521a96d531ea4c71bc52f367aed44d5b8448c86ea42144281e5d72
 DIST banshee-community-extensions-2.4.0.tar.bz2 892287 SHA256 6f20404de80090bb5d88a57c043e876a192f480ac3488ce7697344f1447d48b3 SHA512 fbaad9ede79fc2ae6ddccd3799e465ea9d0fc08251cca7be5a7eebe041b3b71d788bb767e070737c2d7c8ddeffcd196bc353d37c30489f1a77c6d9c2e2c991da WHIRLPOOL d8ba009ccbd1c8192ca3ec333a271f4f40205ed514fc7fd9c0a64ef43a3a96b923d5ffc7d175eee994f6e713f99e57670e7659a95a31205a2eed10b6be407400

diff --git a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.2.0.ebuild b/media-plugins/banshee-community-extensions/banshee-community-extensions-2.2.0.ebuild
deleted file mode 100644
index e9730b4..0000000
--- a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit base mono
-
-DESCRIPTION="Community-developed plugins for the Banshee media player"
-HOMEPAGE="http://banshee.fm/"
-SRC_URI="http://download.banshee-project.org/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc lastfmfingerprint lirc lyrics mirage telepathy"
-
-DEPEND=">=dev-lang/mono-2.0
-	>=media-sound/banshee-2.1.0[web]
-	>=gnome-base/gconf-2.0
-	dev-dotnet/gconf-sharp:2
-	doc? ( >=app-text/gnome-doc-utils-0.17.3 )
-	lastfmfingerprint? (
-		sci-libs/fftw:3.0
-		media-libs/libsamplerate
-	)
-	lirc? ( app-misc/lirc  )
-	mirage? (
-		dev-libs/glib:2
-		dev-db/sqlite:3
-		sci-libs/fftw:3.0
-		media-libs/libsamplerate
-		>=media-libs/gstreamer-0.10.15:0.10
-		>=media-libs/gst-plugins-base-0.10.15:0.10
-	)
-	telepathy? (
-		dev-dotnet/notify-sharp
-		>=dev-lang/mono-2.4.2
-	)"
-RDEPEND="${DEPEND}
-	!media-plugins/banshee-lyrics
-	!media-plugins/banshee-mirage"
-
-src_configure() {
-	# Disable ClutterFlow as we don't have clutter-sharp and co in tree
-	# Disable UbuntuOneMusicStore as we don't have ubuntuone-sharp
-	# Disable AppIndicator as it's not in tree
-	# Disable OpenVP as some of its dependencies are not in the tree
-	# Disable SoundMenu as it requires indicate-sharp
-	# Disable zeitgeistdataprovider as it requires zeitgeist-sharp
-	local myconf="--enable-gnome
-		--disable-static
-		--enable-release
-		--disable-maintainer-mode
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--disable-scrollkeeper
-		--disable-clutterflow --disable-appindicator --disable-openvp
-		--disable-zeitgeistdataprovider
-		--enable-ampache --enable-karaoke --enable-jamendo
-		--enable-randombylastfm --enable-albumartwriter
-		--enable-duplicatesongdetector"
-
-	econf \
-		$(use_enable doc user-help) \
-		$(use_enable lastfmfingerprint) \
-		$(use_enable lirc) \
-		$(use_enable lyrics) \
-		$(use_enable mirage) \
-		$(use_enable telepathy) \
-		$(use_enable test tests) \
-		${myconf}
-}
-
-src_install() {
-	base_src_install
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-	dodoc AUTHORS NEWS README
-}

diff --git a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r1.ebuild b/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild
similarity index 85%
rename from media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r1.ebuild
rename to media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild
index 3917e66..17a42bb 100644
--- a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r1.ebuild
+++ b/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,10 +13,10 @@ SRC_URI="http://download.banshee-project.org/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc lastfmfingerprint lirc lyrics mirage telepathy zeitgeist"
+IUSE="doc lastfmfingerprint lirc mirage telepathy zeitgeist"
 
 DEPEND=">=dev-lang/mono-2.0
-	>=media-sound/banshee-2.4.0[web]
+	>=media-sound/banshee-2.4.0
 	>=gnome-base/gconf-2.0
 	dev-dotnet/gconf-sharp:2
 	doc? ( >=app-text/gnome-doc-utils-0.17.3 )
@@ -42,7 +42,6 @@ DEPEND=">=dev-lang/mono-2.0
 		dev-dotnet/zeitgeist-sharp
 	)"
 RDEPEND="${DEPEND}
-	!media-plugins/banshee-lyrics
 	!media-plugins/banshee-mirage"
 
 DOCS=( AUTHORS NEWS README )
@@ -54,6 +53,7 @@ src_configure() {
 	# Disable OpenVP as some of its dependencies are not in the tree
 	# Disable SoundMenu as it requires indicate-sharp
 	# Disable zeitgeistdataprovider as it requires zeitgeist-sharp
+	# Disable Lyrics, Karaoke & Jamendo as they require banshee[web]
 	local myconf="--enable-gnome
 		--disable-static
 		--enable-release
@@ -62,15 +62,15 @@ src_configure() {
 		--with-vendor-build-id=Gentoo/${PN}/${PVR}
 		--disable-scrollkeeper
 		--disable-clutterflow --disable-appindicator --disable-openvp
-		--enable-ampache --enable-karaoke --enable-jamendo
+		--enable-ampache --disable-karaoke --disable-jamendo
 		--enable-randombylastfm --enable-albumartwriter
-		--enable-duplicatesongdetector --enable-foldersync"
+		--enable-duplicatesongdetector --enable-foldersync
+		--disable-lyrics"
 
 	econf \
 		$(use_enable doc user-help) \
 		$(use_enable lastfmfingerprint) \
 		$(use_enable lirc) \
-		$(use_enable lyrics) \
 		$(use_enable mirage) \
 		$(use_enable telepathy) \
 		$(use_enable zeitgeist zeitgeistdataprovider) \

diff --git a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0.ebuild b/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0.ebuild
deleted file mode 100644
index a7a5098..0000000
--- a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit base mono
-
-DESCRIPTION="Community-developed plugins for the Banshee media player"
-HOMEPAGE="http://banshee.fm/download/extensions/"
-SRC_URI="http://download.banshee-project.org/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc lastfmfingerprint lirc lyrics mirage telepathy"
-
-DEPEND=">=dev-lang/mono-2.0
-	>=media-sound/banshee-2.4.0[web]
-	>=gnome-base/gconf-2.0
-	dev-dotnet/gconf-sharp:2
-	doc? ( >=app-text/gnome-doc-utils-0.17.3 )
-	lastfmfingerprint? (
-		sci-libs/fftw:3.0
-		media-libs/libsamplerate
-	)
-	lirc? ( app-misc/lirc  )
-	mirage? (
-		dev-libs/glib:2
-		dev-db/sqlite:3
-		sci-libs/fftw:3.0
-		media-libs/libsamplerate
-		>=media-libs/gstreamer-0.10.15:0.10
-		>=media-libs/gst-plugins-base-0.10.15:0.10
-	)
-	telepathy? (
-		dev-dotnet/notify-sharp
-		>=dev-lang/mono-2.4.2
-	)"
-RDEPEND="${DEPEND}
-	!media-plugins/banshee-lyrics
-	!media-plugins/banshee-mirage"
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
-	# Disable ClutterFlow as we don't have clutter-sharp and co in tree
-	# Disable UbuntuOneMusicStore as we don't have ubuntuone-sharp
-	# Disable AppIndicator as it's not in tree
-	# Disable OpenVP as some of its dependencies are not in the tree
-	# Disable SoundMenu as it requires indicate-sharp
-	# Disable zeitgeistdataprovider as it requires zeitgeist-sharp
-	local myconf="--enable-gnome
-		--disable-static
-		--enable-release
-		--disable-maintainer-mode
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--disable-scrollkeeper
-		--disable-clutterflow --disable-appindicator --disable-openvp
-		--enable-ampache --enable-karaoke --enable-jamendo
-		--enable-randombylastfm --enable-albumartwriter
-		--enable-duplicatesongdetector --enable-foldersync"
-
-	econf \
-		$(use_enable doc user-help) \
-		$(use_enable lastfmfingerprint) \
-		$(use_enable lirc) \
-		$(use_enable lyrics) \
-		$(use_enable mirage) \
-		$(use_enable telepathy) \
-		--disable-zeitgeistdataprovider \
-		$(use_enable test tests) \
-		${myconf}
-}
-
-src_install() {
-	base_src_install
-	prune_libtool_files --all
-}

diff --git a/media-plugins/banshee-community-extensions/metadata.xml b/media-plugins/banshee-community-extensions/metadata.xml
index 5f52df0..4df5765 100644
--- a/media-plugins/banshee-community-extensions/metadata.xml
+++ b/media-plugins/banshee-community-extensions/metadata.xml
@@ -14,8 +14,6 @@
 	  music automatically, using the Last.fm online service.</flag>
 	  <flag name="lirc">Enable the remote control plugin (uses
 		  <pkg>app-misc/lirc</pkg>)</flag>
-	  <flag name="lyrics">Enable support for automatically fetching
-		  lyrics</flag>
 	  <flag name="mirage">Enable the Mirage plugin which automatically, and
 		  intelligently generates playlists for you</flag>
 	  <flag name="telepathy">Enables the Telepathy plugin which lets you to