[gentoo-commits] proj/kde:master commit in: media-libs/liblastfm/, media-libs/liblastfm/files/

[gentoo-commits] proj/kde:master commit in: media-libs/liblastfm/, media-libs/liblastfm/files/

[Michael Palimaka]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2529 bytes --]

commit:     95a7db63ef7552b17b908306862224c4e29d6f33
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Apr 28 20:21:27 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Apr 28 20:22:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=95a7db63

[media-libs/liblastfm] Add patch from main tree to fix compilatino, thanks to Sput for the report.

(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/liblastfm-0.3.3-ruby-1.9-fix.patch       |   28 ++++++++++++++++++++
 media-libs/liblastfm/liblastfm-9999.ebuild         |    4 ++-
 2 files changed, 31 insertions(+), 1 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
new file mode 100644
index 0000000..83f1c23
--- /dev/null
+++ b/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch
@@ -0,0 +1,28 @@
+$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 598c4b3..f13165d 100644
--- a/media-libs/liblastfm/liblastfm-9999.ebuild
+++ b/media-libs/liblastfm/liblastfm-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit multilib git-2
+inherit eutils multilib git-2
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="http://github.com/mxcl/liblastfm/"
@@ -30,6 +30,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 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"

[gentoo-commits] proj/kde:master commit in: media-libs/liblastfm/, media-libs/liblastfm/files/

[Johannes Huber]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 4071 bytes --]

commit:     d66cbb0ee4f217d53cb71fe556676a42f553dc23
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 12:54:39 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 12:55:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d66cbb0e

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

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

---
 .../files/liblastfm-0.3.3-ruby-1.9-fix.patch       |   28 -------------
 media-libs/liblastfm/liblastfm-9999.ebuild         |   41 +++++++++++---------
 media-libs/liblastfm/metadata.xml                  |    3 +
 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 83f1c23..0000000
--- 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 f13165d..0e4fd00 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 8d1e86a..7da8be8 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>