Remove broken VLC engine wrt #325237 by Lars Wendler.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 10 insertions, 44 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 179041dbdfba..6bd685e351b1 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/clementine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.7 2010/06/09 15:50:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.8 2010/06/23 17:00:01 ssuominen Exp $
+
+  23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> clementine-0.3.ebuild:
+  Remove broken VLC engine wrt #325237 by Lars Wendler.
 
   09 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> clementine-0.3.ebuild:
   Fix missing glib-2.0 include dirs wrt #320699 by Elias Probst and Vicente
diff --git a/media-sound/clementine/clementine-0.2.ebuild b/media-sound/clementine/clementine-0.2.ebuild
deleted file mode 100644
index d7f5ed91ca9d..000000000000
--- a/media-sound/clementine/clementine-0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.2.ebuild,v 1.3 2010/05/14 11:10:23 ssuominen Exp $
-
-EAPI=2
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
-HOMEPAGE="http://code.google.com/p/clementine-player/"
-SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4[sqlite]
-	x11-libs/qt-opengl:4
-	media-libs/liblastfm
-	x11-libs/libnotify
-	media-libs/xine-lib
-	>=media-libs/taglib-1.6
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.39
-	dev-util/pkgconfig"
-
-DOCS="Changelog TODO"
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/clementine/clementine-0.3.ebuild b/media-sound/clementine/clementine-0.3.ebuild
index bb72bd967eee..2c5510dacaaf 100644
--- a/media-sound/clementine/clementine-0.3.ebuild
+++ b/media-sound/clementine/clementine-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild,v 1.4 2010/06/09 15:51:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.3.ebuild,v 1.5 2010/06/23 17:00:01 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils gnome2-utils flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer vlc +xine"
+IUSE="gstreamer +xine"
 
 COMMON_DEPEND="x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
@@ -22,9 +22,8 @@ COMMON_DEPEND="x11-libs/qt-gui:4
 	dev-libs/glib:2
 	gstreamer? ( >=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10 )
-	vlc? ( media-video/vlc )
 	xine? ( media-libs/xine-lib )
-	!gstreamer? ( !vlc? ( media-libs/xine-lib ) )"
+	!gstreamer? ( media-libs/xine-lib )"
 RDEPEND="${COMMON_DEPEND}
 	gstreamer? ( >=media-plugins/gst-plugins-meta-0.10
 		>=media-plugins/gst-plugins-gio-0.10 )"
@@ -35,19 +34,16 @@ DEPEND="${COMMON_DEPEND}
 DOCS="Changelog TODO"
 
 src_configure() {
-	# -DENGINE_QT_PHONON_ENABLED=ON doesn't compile
-
-	# Harmless workaround for bug 320699.
-	append-cppflags $(pkg-config --cflags-only-I glib-2.0)
+	append-cppflags "$(pkg-config --cflags-only-I glib-2.0)" #320699
 
 	mycmakeargs=(
 		$(cmake-utils_use gstreamer ENGINE_GSTREAMER_ENABLED)
-		$(cmake-utils_use vlc ENGINE_LIBVLC_ENABLED)
+		"-DENGINE_LIBVLC_ENABLED=OFF"
 		$(cmake-utils_use xine ENGINE_LIBXINE_ENABLED)
 		"-DENGINE_QT_PHONON_ENABLED=OFF"
 		)
 
-	if ! use gstreamer && ! use vlc; then
+	if ! use gstreamer; then
 		mycmakeargs+=(
 			"-DENGINE_LIBXINE_ENABLED=ON"
 			)