Import upstream patch for solving database error with first run wrt #401713

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 149 insertions, 1 deletions

diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 625b1a9018ce..02e5f0c4351a 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/clementine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.51 2012/01/28 14:02:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.52 2012/02/09 13:54:02 ssuominen Exp $
+
+*clementine-1.0.1-r1 (09 Feb 2012)
+
+  09 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +clementine-1.0.1-r1.ebuild, +files/clementine-1.0.1-fresh-start.patch:
+  Import upstream patch for solving database error with first run wrt #401713
 
   28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   clementine-0.7.1-r2.ebuild, clementine-1.0.0.ebuild, clementine-1.0.1.ebuild:
diff --git a/media-sound/clementine/clementine-1.0.1-r1.ebuild b/media-sound/clementine/clementine-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..cc763ca6545e
--- /dev/null
+++ b/media-sound/clementine/clementine-1.0.1-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.0.1-r1.ebuild,v 1.1 2012/02/09 13:54:02 ssuominen Exp $
+
+EAPI=4
+
+LANGS=" ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt_BR pt ro ru sk sl sr@latin sr sv tr uk vi zh_CN zh_TW"
+
+inherit cmake-utils eutils gnome2-utils virtualx
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
+HOMEPAGE="http://www.clementine-player.org/ 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="ayatana cdda +dbus ios ipod kde lastfm mms mtp projectm test +udev wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	ios? ( ipod )
+	udev? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	>=x11-libs/qt-gui-4.5:4[dbus?]
+	>=x11-libs/qt-opengl-4.5:4
+	>=x11-libs/qt-sql-4.5:4[sqlite]
+	dev-db/sqlite[fts3]
+	>=media-libs/taglib-1.7
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/qjson
+	media-libs/libechonest
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	ayatana? ( dev-libs/libindicate-qt )
+	cdda? ( dev-libs/libcdio )
+	ipod? (
+		>=media-libs/libgpod-0.8.0[ios?]
+		ios? (
+			app-pda/libplist
+			>=app-pda/libimobiledevice-1.0
+			app-pda/usbmuxd
+		)
+	)
+	kde? ( >=kde-base/kdelibs-4.4 )
+	lastfm? ( >=media-libs/liblastfm-0.3.3 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? ( media-libs/glew )
+"
+# now only presets are used, libprojectm is internal
+# http://code.google.com/p/clementine-player/source/browse/#svn/trunk/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udev? ( sys-fs/udisks ) )
+	mms? ( media-plugins/gst-plugins-libmms:0.10 )
+	mtp? ( gnome-base/gvfs )
+	projectm? ( >=media-libs/libprojectm-1.2.0 )
+	media-plugins/gst-plugins-meta:0.10
+	media-plugins/gst-plugins-gio:0.10
+	media-plugins/gst-plugins-soup:0.10
+	media-plugins/gst-plugins-taglib:0.10
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39
+	dev-util/pkgconfig
+	sys-devel/gettext
+	x11-libs/qt-test:4
+	kde? ( dev-util/automoc )
+	dev-cpp/gmock
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS="Changelog"
+
+src_prepare() {
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-fresh-start.patch
+}
+
+src_configure() {
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	# spotify is not in portage
+	# REMOTE is unstable
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		-DLINGUAS="${langs}"
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		$(cmake-utils_use cdda ENABLE_AUDIOCD)
+		$(cmake-utils_use dbus ENABLE_DBUS)
+		$(cmake-utils_use udev ENABLE_DEVICEKIT)
+		$(cmake-utils_use ipod ENABLE_LIBGPOD)
+		$(cmake-utils_use ios ENABLE_IMOBILEDEVICE)
+		$(cmake-utils_use kde ENABLE_PLASMARUNNER)
+		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
+		$(cmake-utils_use mtp ENABLE_LIBMTP)
+		-DENABLE_GIO=ON
+		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
+		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		-DENABLE_SPOTIFY=OFF
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_REMOTE=OFF
+		-DENABLE_BREAKPAD=OFF
+		-DSTATIC_SQLITE=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	Xemake test
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/clementine/files/clementine-1.0.1-fresh-start.patch b/media-sound/clementine/files/clementine-1.0.1-fresh-start.patch
new file mode 100644
index 000000000000..fbde984ae460
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.0.1-fresh-start.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/401713
+http://code.google.com/p/clementine-player/source/detail?r=3ade9217d73b
+http://pkgs.fedoraproject.org/gitweb/?p=clementine.git;a=blob_plain;f=clementine-fresh-start.patch;hb=HEAD
+
+--- data/schema/schema.sql
++++ data/schema/schema.sql
+@@ -35,4 +35,5 @@ CREATE TABLE songs (
+ CREATE TABLE schema_version (
+   version INTEGER NOT NULL
+ );
++
+ INSERT INTO schema_version (version) VALUES (0);