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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 159 insertions, 9 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/Manifest b/media-sound/clementine/Manifest
index 3a80479d25f6..44eb36db2615 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,22 +2,24 @@
 Hash: SHA1
 
 AUX clementine-0.7.1-fix-devicekit.patch 698 RMD160 0e109485830bd8631f7c1498ae3270ce81f70843 SHA1 3b839f706f3c5865864c7f17c11b434ab43ae15e SHA256 3b31927a82e571d93eecbf32f9ba8cc0d23cb30c83e31077837f5f9fcd96b277
+AUX clementine-1.0.1-fresh-start.patch 418 RMD160 9d2c10e97e057e23363df418216b54406faaf5b1 SHA1 45763e9c1aad2492f970f041d9f36d84c0c4d0da SHA256 8bc9d43cb36d707d6a32c19c02f76ce93d9cd457f247ba4b2bfa5052206a3c8d
 DIST clementine-0.7.1.tar.gz 5967162 RMD160 a7a7625b42d7070897124258ff979c82c236665e SHA1 8b2025b8876f9f3fe33ef5001e0621f3a5d0f142 SHA256 246e56f9283384b354bd43d5ec9937ceb93889f680f7bf45bd1ab00db36d61bc
 DIST clementine-1.0.0.tar.gz 8222950 RMD160 3a2fdde59754d262646ea3bad17813ed1248e24a SHA1 ba49c686ea5759e33d6b89179965503fd369cf30 SHA256 9ee14a4a273e9f807ced25b80a92242433799ef8eb36a0cddd0f5f0965737e35
 DIST clementine-1.0.1.tar.gz 8267876 RMD160 fd4bf6dbf05a211c5a1778951ca8666598e06953 SHA1 e05320da689e2fad744fd3e68518bc4103ecf0fd SHA256 bf28c6584e280f58e8ebf7ba33cee1f926c0b8f1857ae605164ecbb2ff096e7d
 EBUILD clementine-0.7.1-r2.ebuild 3450 RMD160 059f8902c7915ccd0800d1542a259d16e0a7ebd8 SHA1 356ad507d6d73ebaa4c070f5b79f6d391ebdeb5c SHA256 5ad9c9d56b807e66d452c1eeb3646d34163478658fd69cf7bd27ecb29624fdab
 EBUILD clementine-1.0.0.ebuild 3721 RMD160 4ea2440f3c2dd4061a24612527278d7ac39d9309 SHA1 56ce8825f3d3d4a7ddbcea3e13b543a04834dbd2 SHA256 1b3bce18aa4508f21b322ae2dfb37ffe0b24392cb0383dbcd5cb0de3bbfa5edf
+EBUILD clementine-1.0.1-r1.ebuild 3760 RMD160 6243fea71aa5514a189e30040d02c2168a90659d SHA1 8fdff77388ab700ecf65cc9e6889b9fe4313145d SHA256 0a37c5949983409849e6353771144191832e87be91ca4439391292cc69228d9d
 EBUILD clementine-1.0.1.ebuild 3704 RMD160 2cfab1de1375b34e9c305ed9c16a65d3304c54c3 SHA1 f1dfd784110b9ae6e0d07223a35d6783d3723c9b SHA256 a3d9c8f3a13dbc3ca396c1bf7e23ffb431552b8fd971c4d165e6f3e8a83d7aec
-MISC ChangeLog 8066 RMD160 5ae18729e783098e6c7228b23f9c0f8a4cbd9e4d SHA1 f516677318e03a5ee2db3d1cfc61d3fc2d011605 SHA256 23accba1ea603ce2c010a5674d8ef28bf4640814c05a8e17d0dd33f106adb65b
+MISC ChangeLog 8309 RMD160 d8757e0422682b758620d647df9d11e0f0e59f95 SHA1 488086bfeb00d4d1af58fa456b73e140483a5e80 SHA256 2ccec1b19c47339f182aa1e25439dfab06e5ae9106586ffb2ab8249e85eead32
 MISC metadata.xml 888 RMD160 9a373562516fa5397a3f172e4facdbc2b145ef00 SHA1 f6d0bb96768abf81cb1d6b44b58a56af36a1de22 SHA256 ef226e2288c1828c6ff03cd804cc81a9901a284f0b1a61df26c57894b1efb8af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPI/9/AAoJEEdUh39IaPFNBpYH/iBGitNdbk/MGATgbfAqO00y
-XoQ9fU3Soz7oGr+W79COnLZbmghiItGAf8HqnygnXSo3aiw0wtVVQbrdl2u97k9Y
-xdyKtoVL37HEoT1A5xTdf0B7vZ4vpvQXp5CzKY+ECq45X/N+i5bAbHvFU0Clp0Kl
-7HGywAitd5Azht1K4OOeJQck8lD5OHcDXaG50WzSgWu0BbR6DXQdfxY057RE2yCp
-3QlrAJDH+bC+dHh8xfkEqntczkM8eWSwxc+dRuML+SsLHger3GlVLRLyRB0wIDed
-+01R59F95MAhvdcbLzQioey1wwhSh5QMIDbLCTfIiF2dYS6pQN4MmTKkYeurSeQ=
-=3CKh
+iQEcBAEBAgAGBQJPM883AAoJEEdUh39IaPFNV7gH/0KRKbXTWUq2r/fN22q3NvzS
+uHdPlOOIHEQlSpvsAyLg2/LEIeTkmSLxdE/gZh+AnGuFWYdN+/GQWQSp861Q/Sz+
+1WLXUx9WluzhUfKKMcTgDdiCDX7nuvwFKGSiIXgQm77xhpiEAalDVQZkQuxpB2EJ
+u0uMpF4Q/qmYSAz9SlsWjsZXqT0SSqzfEyjXKVrlEupKRZCmZFFZGG7XExzdUylZ
+fDZyE2fHlavhiNN3GX24lbH/qS6UGvxgn87jnhoT4ioA5EpIhQlnWxWXmPW+Iyd+
+xc2NhcHjmj6QeqHNJc5iFmVhzdjAPyi2/mogHDqJ4M7+lkb+XA7ypKv/sQ0mygE=
+=b5r2
 -----END PGP SIGNATURE-----
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);