Version bump, remove old.

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

4 files changed, 58 insertions, 54 deletions

diff --git a/media-libs/liblastfm/ChangeLog b/media-libs/liblastfm/ChangeLog
index d3486fa4ae5e..cd239635d33d 100644
--- a/media-libs/liblastfm/ChangeLog
+++ b/media-libs/liblastfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/liblastfm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.15 2011/06/01 19:49:24 ranger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.16 2012/06/23 13:03:59 johu Exp $
+
+*liblastfm-1.0.1 (23 Jun 2012)
+
+  23 Jun 2012; Johannes Huber <johu@gentoo.org> +liblastfm-1.0.1.ebuild,
+  -liblastfm-0.3.0.ebuild, metadata.xml:
+  Version bump, remove old.
 
   01 Jun 2011; Brent Baude <ranger@gentoo.org> liblastfm-0.3.3.ebuild:
   Marking liblastfm-0.3.3 ppc stable for bug 354033
diff --git a/media-libs/liblastfm/liblastfm-0.3.0.ebuild b/media-libs/liblastfm/liblastfm-0.3.0.ebuild
deleted file mode 100644
index b36c11c31005..000000000000
--- a/media-libs/liblastfm/liblastfm-0.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-0.3.0.ebuild,v 1.11 2010/07/07 20:32:57 ssuominen Exp $
-
-EAPI="2"
-
-inherit multilib
-
-DESCRIPTION="Collection of libraries to integrate Last.fm services"
-HOMEPAGE="http://github.com/mxcl/liblastfm/"
-SRC_URI="http://cdn.last.fm/src/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE=""
-
-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
-"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/ruby
-	>=x11-libs/qt-test-4.5:4
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/lastfmlib-0.4.0
-"
-
-src_prepare() {
-	# Fix multilib paths
-	find . -name *.pro -exec sed -i -e "/target.path/s/lib/$(get_libdir)/g" {} + \
-		|| die "failed to fix multilib paths"
-
-	# >=1.9 ruby compatibility
-	case `ruby -e 'puts RUBY_VERSION'` in
-		1.8.*) ;;
-		*) sed -e "s/require 'ftools'//g" -i admin/* || die ;;
-	esac
-}
-
-src_configure() {
-	./configure --prefix "${ROOT}usr" --no-strip --release || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}${ROOT}" install || die "emake install failed"
-
-	dodoc README || die "dodoc failed"
-}
diff --git a/media-libs/liblastfm/liblastfm-1.0.1.ebuild b/media-libs/liblastfm/liblastfm-1.0.1.ebuild
new file mode 100644
index 000000000000..7de3c2e11581
--- /dev/null
+++ b/media-libs/liblastfm/liblastfm-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.1.ebuild,v 1.1 2012/06/23 13:03:59 johu Exp $
+
+EAPI=4
+
+QT_MINIMAL="4.8.0"
+inherit cmake-utils
+
+DESCRIPTION="Collection of libraries to integrate Last.fm services"
+HOMEPAGE="http://github.com/eartle/liblastfm"
+SRC_URI="http://cdn.last.fm/client/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="fingerprint test"
+
+COMMON_DEPEND="
+	>=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}
+	test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/lastfmlib-0.4.0
+"
+
+# 1 of 2 is failing, last checked 2012-06-22 / version 1.0.1
+RESTRICT="test"
+
+src_configure() {
+	# 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 8d1e86a9cefb..7da8be8d13f0 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>