[media-libs/liblastfm] Move to active upstream fork.

(Portage version: 2.2.0_alpha110/git/Linux i686, unsigned Manifest commit)

3 files changed, 26 insertions, 46 deletions

diff --git a/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch b/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch
deleted file mode 100644
index 83f1c23b220..00000000000
--- a/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/09/25 10:16:46 wiz Exp $
-
-ruby-1.9 doesn't have "." in default search path.
-
---- admin/qpp.orig	2010-09-11 14:16:54.000000000 +0000
-+++ admin/qpp
-@@ -3,6 +3,7 @@
- # RESOURCES under each argument to ARGV as directories
- 
- cwd=File.dirname __FILE__
-+$:.push(".")
- require 'find'
- require "#{cwd}/findsrc"
- 
-$NetBSD: patch-ab,v 1.1 2010/09/25 10:16:46 wiz Exp $
-
-ruby-1.9 doesn't have "." in default search path.
-
---- admin/Makefile.rb.orig	2010-09-25 10:12:30.000000000 +0000
-+++ admin/Makefile.rb
-@@ -5,6 +5,7 @@
- # class names in there which #include the file that contains the class
- 
- cwd = File.dirname( __FILE__ )
-+$:.push(".")
- require 'find'
- require "#{cwd}/platform.rb"
- 
diff --git a/media-libs/liblastfm/liblastfm-9999.ebuild b/media-libs/liblastfm/liblastfm-9999.ebuild
index f13165d1ab7..0e4fd006ff7 100644
--- a/media-libs/liblastfm/liblastfm-9999.ebuild
+++ b/media-libs/liblastfm/liblastfm-9999.ebuild
@@ -4,39 +4,44 @@
 
 EAPI=4
 
-inherit eutils multilib git-2
+QT_MINIMAL="4.8.0"
+inherit cmake-utils git-2
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
-HOMEPAGE="http://github.com/mxcl/liblastfm/"
-EGIT_REPO_URI="git://github.com/mxcl/liblastfm.git"
+HOMEPAGE="http://github.com/eartle/liblastfm"
+EGIT_REPO_URI="git://github.com/eartle/liblastfm.git"
 
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE=""
+IUSE="fingerprint test"
 
 COMMON_DEPEND="
-	>=media-libs/libsamplerate-0.1.4
-	sci-libs/fftw:3.0
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-sql-4.5:4
+	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-dbus-${QT_MINIMAL}:4
+	fingerprint? (
+		media-libs/libsamplerate
+		sci-libs/fftw:3.0
+		>=x11-libs/qt-sql-${QT_MINIMAL}:4
+	)
 "
 DEPEND="${COMMON_DEPEND}
-	dev-lang/ruby
-	>=x11-libs/qt-test-4.5:4
+	test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<media-libs/lastfmlib-0.4.0
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.3-ruby-1.9-fix.patch
-
-	# Fix multilib paths
-	find . -name *.pro -exec sed -i -e "/target.path/s/lib/$(get_libdir)/g" {} + \
-		|| die "failed to fix multilib paths"
-}
+# 1 of 2 is failing, last checked 2012-06-22 / version 1.0.1
+RESTRICT="test"
 
 src_configure() {
-	./configure --prefix /usr --no-strip --release || die "configure failed"
+	# demos not working
+	local mycmakeargs=(
+		-DBUILD_DEMOS=OFF
+		$(cmake-utils_use_build fingerprint)
+		$(cmake-utils_use_build test TESTS)
+	)
+
+	cmake-utils_src_configure
 }
diff --git a/media-libs/liblastfm/metadata.xml b/media-libs/liblastfm/metadata.xml
index 8d1e86a9cef..7da8be8d13f 100644
--- a/media-libs/liblastfm/metadata.xml
+++ b/media-libs/liblastfm/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<use>
+	<flag name="fingerprint">Build the lastfm-fingerprint library</flag>
+</use>
 </pkgmetadata>