Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 7f62c77bc50ea71b4fc1c69ac01c82977e923c58..ed532cab37d1634aa88d034f27e7c18e387da452 100644 (file)
--- 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.4 2010/04/27 20:01:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.5 2010/05/14 11:10:23 ssuominen Exp $
+
+*clementine-0.3 (14 May 2010)
+
+  14 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +clementine-0.3.ebuild, metadata.xml:
+  Version bump.
 
   27 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> clementine-0.2.ebuild:
   Clementine reportedly compiled with boost-1.39 wrt #317521 by adriancz.

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 88f1893b2e0cede563b78b4596ec13905e657a01..52770092404005f385df1f6fe3f0c520b7f9e055 100644 (file)
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,6 +1,6 @@
-DIST clementine-0.1.tar.gz 1789518 RMD160 007cdd369189cb78a158552cdec42c114b633839 SHA1 7ca3f0d22edf65f3774d9352ff434b67b214969c SHA256 e9c55cb9207a5a1dc1a6a213dcee35533a6036f0ace508a94bb4c47d688c0c18
 DIST clementine-0.2.tar.gz 3647928 RMD160 54216323302f3a155385b80cdbb6a8d65bc7186e SHA1 cff040b2b738e7c673297bdd690cd81dfbbbb1f9 SHA256 9c04956dfe8ec244b50ffc2bf43047c616ec1f580ebd0c2f862237bdf740114a
-EBUILD clementine-0.1.ebuild 1249 RMD160 ef33ffd30ba2690a7432696d47efa1ed2cea0675 SHA1 eb548ef9a82f45a4e8610766fbf7f5b85d32f214 SHA256 c832d8aa545f639c80312c52adfa0bf8a9d180153a5bf51a724ac012ee4a5539
-EBUILD clementine-0.2.ebuild 929 RMD160 d3c28b292209e3b28fe3345e62ef09c0d696528f SHA1 110b91f703c5895b51d107fea955fc3b0cf27373 SHA256 644d27d89fc0416f4952e3c604974056a8d85d884e05e5dfef7026f82a5c8788
-MISC ChangeLog 732 RMD160 7a021a777bdde0e8728ab5bbe40b7c1c901c86b7 SHA1 f31b7e31e5cd300cbf21ec1118cac493a0912e7b SHA256 a7ed1d16c010a95996a4a3dee6463564a03e710583555befd7c5592605ada8b3
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+DIST clementine-0.3.tar.gz 3917108 RMD160 b5238aa0b5dd16758205a6dde7f44bbc759b3225 SHA1 7d0337f8bbe93f6320a10776c14d211f5ba507e9 SHA256 4041f55d6bc2f3388bfc070867d1f22f7430a66aa656003c311679f548e9c582
+EBUILD clementine-0.2.ebuild 935 RMD160 4423894e7c3d9584028c0694dcd0a22093c3e75a SHA1 2659a53cb24eef881df3c33f986d04447a06350c SHA256 000badd2fd217e62ae3e130e0f011182ee21a147b68c742853c1b1a902cf4401
+EBUILD clementine-0.3.ebuild 1595 RMD160 3a41856afef5846b5bfe88f47d7638c4e224ea95 SHA1 0c71e979ff7a1e1184409188bb26451b88970c8a SHA256 28960f61ba428147497954ceb5745997a49773d941bb0bbd1fda0af1040f04e6
+MISC ChangeLog 874 RMD160 a95ba6b5b80eb3950df13a7add2827744a63f7a9 SHA1 1b863c25938101ab441957073cd22900afa4fee8 SHA256 b450147b4ed08457b17adcebcdbab236fba41fdcd3a12a27d6a0a14aa8d5796e
+MISC metadata.xml 235 RMD160 6f309833614adcd4f183adbe30278fd96fe1f35c SHA1 df4fbbdee548de206f30f5f9240aa03d1801091a SHA256 e8c2f672d53da40e31ebed04d574c032decfb25fb096fee08ab6c1d1344f066f

diff --git a/media-sound/clementine/clementine-0.1.ebuild b/media-sound/clementine/clementine-0.1.ebuild
deleted file mode 100644 (file)
index 010effb..0000000
--- a/media-sound/clementine/clementine-0.1.ebuild
+++ /dev/null
@@ -1,53 +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.1.ebuild,v 1.2 2010/03/04 21:34:05 wired Exp $
-
-EAPI=2
-inherit eutils gnome2-utils qt4-r2
-
-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
-       dev-libs/glib:2"
-DEPEND="${RDEPEND}
-       >=dev-libs/boost-1.41
-       dev-util/pkgconfig"
-
-src_prepare() {
-       sed -i \
-               -e "s:application-x-${PN}:${PN}:" \
-               dist/${PN}.desktop || die
-
-       qt4-r2_src_prepare
-}
-
-src_install() {
-       dobin src/${PN} || die
-
-       local res
-       for res in 16 32 64; do
-               insinto /usr/share/icons/hicolor/${res}x${res}/apps
-               newins dist/${PN}_${res}.png ${PN}.png || die
-       done
-
-       domenu dist/${PN}.desktop
-
-       dodoc 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.2.ebuild b/media-sound/clementine/clementine-0.2.ebuild
index 973a476defceae6bf8fe1ea9d5df13239b4382d8..d7f5ed91ca9d39e06de6082a7a1306c545e93664 100644 (file)
--- a/media-sound/clementine/clementine-0.2.ebuild
+++ b/media-sound/clementine/clementine-0.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.2.ebuild,v 1.2 2010/04/27 20:01:07 ssuominen Exp $
+# $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
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/qt-gui:4
        media-libs/liblastfm
        x11-libs/libnotify
        media-libs/xine-lib
-       media-libs/taglib
+       >=media-libs/taglib-1.6
        dev-libs/glib:2"
 DEPEND="${RDEPEND}
        >=dev-libs/boost-1.39

diff --git a/media-sound/clementine/clementine-0.3.ebuild b/media-sound/clementine/clementine-0.3.ebuild
new file mode 100644 (file)
index 0000000..9d3ba94
--- /dev/null
+++ b/media-sound/clementine/clementine-0.3.ebuild
@@ -0,0 +1,57 @@
+# 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.1 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="gstreamer vlc +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
+       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 ) )"
+RDEPEND="${COMMON_DEPEND}
+       gstreamer? ( >=media-plugins/gst-plugins-meta-0.10 )"
+DEPEND="${COMMON_DEPEND}
+       >=dev-libs/boost-1.39
+       dev-util/pkgconfig"
+
+DOCS="Changelog TODO"
+
+src_configure() {
+       # -DENGINE_QT_PHONON_ENABLED=ON doesn't compile
+
+       mycmakeargs=(
+               $(cmake-utils_use gstreamer ENGINE_GSTREAMER_ENABLED)
+               $(cmake-utils_use vlc ENGINE_LIBVLC_ENABLED)
+               $(cmake-utils_use xine ENGINE_LIBXINE_ENABLED)
+               "-DENGINE_QT_PHONON_ENABLED=OFF"
+               )
+
+       if ! use gstreamer && ! use vlc; then
+               mycmakeargs+=(
+                       "-DENGINE_LIBXINE_ENABLED=ON"
+                       )
+       fi
+
+       cmake-utils_src_configure
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }

diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index e1774e3d9ad71fcd59b25ed8c584d61740a2d118..663be1cf81c639bb697d9fa79721741a163520e0 100644 (file)
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+  <herd>sound</herd>
+  <use>
+    <flag name="vlc">Enable support for VLC engine</flag>
+  </use>
 </pkgmetadata>