Version bump.

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

4 files changed, 35 insertions, 76 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index e4aec582ed7c..e9aed7fcc5b0 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2010/07/01 09:59:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.12 2010/07/02 19:12:04 ssuominen Exp $
+
+*clementine-0.4.2 (02 Jul 2010)
+
+  02 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +clementine-0.4.2.ebuild:
+  Version bump. Force with -j1 to avoid translation build failure.
 
   01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> clementine-0.4.ebuild:
   Force gst backend enabled because projectm plug-in is hardcoding it and
diff --git a/media-sound/clementine/clementine-0.3.ebuild b/media-sound/clementine/clementine-0.4.2.ebuild
index 7288841f5e34..610143257e20 100644
--- a/media-sound/clementine/clementine-0.3.ebuild
+++ b/media-sound/clementine/clementine-0.4.2.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.6 2010/06/24 11:43:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-0.4.2.ebuild,v 1.1 2010/07/02 19:12:04 ssuominen Exp $
 
 EAPI=2
 inherit cmake-utils gnome2-utils flag-o-matic
@@ -12,31 +12,39 @@ SRC_URI="http://clementine-player.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer +xine"
+IUSE="gstreamer projectm +xine"
 
-COMMON_DEPEND="x11-libs/qt-gui:4
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	media-libs/liblastfm
+	>=media-libs/taglib-1.6
+	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
 	x11-libs/qt-sql:4[sqlite]
-	>=media-libs/taglib-1.6
-	media-libs/liblastfm
-	dev-libs/glib:2
 	gstreamer? ( >=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )
+		>=media-libs/gst-plugins-base-0.10
+		projectm? ( media-libs/glew ) )
 	xine? ( 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 )"
+	gstreamer? ( >=media-plugins/gst-plugins-meta-0.10 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.39
 	dev-util/pkgconfig"
 
 DOCS="Changelog TODO"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	echo "" > pig.txt
+}
+
 src_configure() {
 	append-cppflags "$(pkg-config --cflags-only-I glib-2.0)" #320699
 
 	mycmakeargs=(
+		"-DENABLE_VISUALISATIONS=OFF"
 		$(cmake-utils_use gstreamer ENGINE_GSTREAMER_ENABLED)
 		"-DENGINE_LIBVLC_ENABLED=OFF"
 		$(cmake-utils_use xine ENGINE_LIBXINE_ENABLED)
@@ -47,6 +55,10 @@ src_configure() {
 		mycmakeargs+=(
 			"-DENGINE_LIBXINE_ENABLED=ON"
 			)
+	else
+		mycmakeargs+=(
+			$(cmake-utils_use_enable projectm VISUALISATIONS)
+			)
 	fi
 
 	cmake-utils_src_configure
@@ -58,9 +70,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if use gstreamer; then
-		echo
-		elog "Install libsoup gstreamer plug-in for internet radio support."
-		echo
+		ewarn
+		ewarn "If media-plugins/gst-plugins-meta doesn't pull in the plugins you"
+		ewarn "need, you have to install them yourself."
+		ewarn
 	fi
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/clementine/clementine-0.4.ebuild b/media-sound/clementine/clementine-0.4.ebuild
deleted file mode 100644
index 2d6cab6e32a6..000000000000
--- a/media-sound/clementine/clementine-0.4.ebuild
+++ /dev/null
@@ -1,63 +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.4.ebuild,v 1.2 2010/07/01 09:59:27 ssuominen Exp $
-
-EAPI=2
-inherit cmake-utils gnome2-utils flag-o-matic
-
-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="xine"
-
-COMMON_DEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4
-	x11-libs/qt-sql:4[sqlite]
-	>=media-libs/taglib-1.6
-	media-libs/liblastfm
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/glew
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-base-0.10
-	xine? ( media-libs/xine-lib )"
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-meta-0.10
-	>=media-plugins/gst-plugins-gio-0.10"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.39
-	dev-util/pkgconfig"
-
-DOCS="Changelog TODO"
-
-src_configure() {
-	append-cppflags "$(pkg-config --cflags-only-I glib-2.0)" #320699
-
-	local mycmakeargs=(
-		"-DENGINE_GSTREAMER_ENABLED=ON"
-		"-DENGINE_LIBVLC_ENABLED=OFF"
-		$(cmake-utils_use xine ENGINE_LIBXINE_ENABLED)
-		"-DENGINE_QT_PHONON_ENABLED=OFF"
-		)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog
-	elog "Install libsoup gstreamer plug-in for internet radio support."
-	elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 3bf6bcfeb512..47192a66b8af 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>
+  <use>
+    <flag name='projectm'>Build with ProjectM visualization</flag>
+  </use>
 </pkgmetadata>