public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/liblastfm: liblastfm-1.0.9.ebuild ChangeLog
@ 2014-10-05 23:53 Manuel Rueger (mrueg)
  0 siblings, 0 replies; 4+ messages in thread
From: Manuel Rueger (mrueg) @ 2014-10-05 23:53 UTC (permalink / raw
  To: gentoo-commits

mrueg       14/10/05 23:53:16

  Modified:             ChangeLog
  Added:                liblastfm-1.0.9.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.32                 media-libs/liblastfm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	14 Dec 2013 11:19:46 -0000	1.31
+++ ChangeLog	5 Oct 2014 23:53:16 -0000	1.32
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/liblastfm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.31 2013/12/14 11:19:46 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.32 2014/10/05 23:53:16 mrueg Exp $
+
+*liblastfm-1.0.9 (05 Oct 2014)
+
+  05 Oct 2014; Manuel Rüger <mrueg@gentoo.org> +liblastfm-1.0.9.ebuild:
+  Version bump.
 
   14 Dec 2013; Johannes Huber <johu@gentoo.org>
   -files/liblastfm-0.3.3-ruby-1.9-fix.patch, -liblastfm-0.3.3.ebuild,



1.1                  media-libs/liblastfm/liblastfm-1.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.1&content-type=text/plain

Index: liblastfm-1.0.9.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.1 2014/10/05 23:53:16 mrueg Exp $

EAPI=5

QT_MINIMAL="4.8.0"
inherit cmake-utils

DESCRIPTION="A Qt C++ library for the Last.fm webservices"
HOMEPAGE="https://github.com/lastfm/liblastfm"
SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="fingerprint test"

COMMON_DEPEND="
	>=dev-qt/qtcore-${QT_MINIMAL}:4
	>=dev-qt/qtdbus-${QT_MINIMAL}:4
	fingerprint? (
		media-libs/libsamplerate
		sci-libs/fftw:3.0
		>=dev-qt/qtsql-${QT_MINIMAL}:4
	)
"
DEPEND="${COMMON_DEPEND}
	test? ( >=dev-qt/qttest-${QT_MINIMAL}:4 )
"
RDEPEND="${COMMON_DEPEND}
	!<media-libs/lastfmlib-0.4.0
"

# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
RESTRICT="test"

src_configure() {
	# demos not working
	# qt5 support broken
	local mycmakeargs=(
		-DBUILD_DEMOS=OFF
		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
		-DBUILD_WITH_QT4=ON
		$(cmake-utils_use_build fingerprint)
		$(cmake-utils_use_build test TESTS)
	)

	cmake-utils_src_configure
}





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-libs/liblastfm: liblastfm-1.0.9.ebuild ChangeLog
@ 2014-10-12 16:54 Michael Palimaka (kensington)
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka (kensington) @ 2014-10-12 16:54 UTC (permalink / raw
  To: gentoo-commits

kensington    14/10/12 16:54:17

  Modified:             liblastfm-1.0.9.ebuild ChangeLog
  Log:
  Import Qt5 support from KDE overlay.
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.2                  media-libs/liblastfm/liblastfm-1.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?r1=1.1&r2=1.2

Index: liblastfm-1.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liblastfm-1.0.9.ebuild	5 Oct 2014 23:53:16 -0000	1.1
+++ liblastfm-1.0.9.ebuild	12 Oct 2014 16:54:16 -0000	1.2
@@ -1,32 +1,43 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.1 2014/10/05 23:53:16 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.2 2014/10/12 16:54:16 kensington Exp $
 
 EAPI=5
 
-QT_MINIMAL="4.8.0"
-inherit cmake-utils
+inherit cmake-utils multibuild
 
-DESCRIPTION="A Qt C++ library for the Last.fm webservices"
+DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
 SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fingerprint test"
+SLOT="0/0"
+IUSE="fingerprint test +qt4 qt5"
 
 COMMON_DEPEND="
-	>=dev-qt/qtcore-${QT_MINIMAL}:4
-	>=dev-qt/qtdbus-${QT_MINIMAL}:4
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+	)
 	fingerprint? (
 		media-libs/libsamplerate
 		sci-libs/fftw:3.0
-		>=dev-qt/qtsql-${QT_MINIMAL}:4
+		qt4? ( dev-qt/qtsql:4 )
+		qt5? ( dev-qt/qtsql:5 )
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qttest-${QT_MINIMAL}:4 )
+	test? (
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	!<media-libs/lastfmlib-0.4.0
@@ -35,16 +46,44 @@
 # 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
 RESTRICT="test"
 
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
 src_configure() {
-	# demos not working
-	# qt5 support broken
-	local mycmakeargs=(
-		-DBUILD_DEMOS=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
-		-DBUILD_WITH_QT4=ON
-		$(cmake-utils_use_build fingerprint)
-		$(cmake-utils_use_build test TESTS)
-	)
+	myconfigure() {
+		# demos not working
+		local mycmakeargs=(
+			-DBUILD_DEMOS=OFF
+			$(cmake-utils_use_build fingerprint)
+			$(cmake-utils_use_build test TESTS)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DBUILD_WITH_QT4=ON)
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DBUILD_WITH_OT4=OFF)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
 
-	cmake-utils_src_configure
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
 }



1.33                 media-libs/liblastfm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	5 Oct 2014 23:53:16 -0000	1.32
+++ ChangeLog	12 Oct 2014 16:54:16 -0000	1.33
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/liblastfm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.32 2014/10/05 23:53:16 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.33 2014/10/12 16:54:16 kensington Exp $
+
+  12 Oct 2014; Michael Palimaka <kensington@gentoo.org> liblastfm-1.0.9.ebuild:
+  Import Qt5 support from KDE overlay.
 
 *liblastfm-1.0.9 (05 Oct 2014)
 





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-libs/liblastfm: liblastfm-1.0.9.ebuild ChangeLog
@ 2014-10-22 14:00 Michael Palimaka (kensington)
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka (kensington) @ 2014-10-22 14:00 UTC (permalink / raw
  To: gentoo-commits

kensington    14/10/22 14:00:57

  Modified:             liblastfm-1.0.9.ebuild ChangeLog
  Log:
  Ensure build against at least one Qt version wrt bug #526472.
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.3                  media-libs/liblastfm/liblastfm-1.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?r1=1.2&r2=1.3

Index: liblastfm-1.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- liblastfm-1.0.9.ebuild	12 Oct 2014 16:54:16 -0000	1.2
+++ liblastfm-1.0.9.ebuild	22 Oct 2014 14:00:57 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.2 2014/10/12 16:54:16 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.3 2014/10/22 14:00:57 kensington Exp $
 
 EAPI=5
 
@@ -15,6 +15,8 @@
 SLOT="0/0"
 IUSE="fingerprint test +qt4 qt5"
 
+REQUIRED_USE="|| ( qt4 qt5 )"
+
 COMMON_DEPEND="
 	qt4? (
 		dev-qt/qtcore:4



1.34                 media-libs/liblastfm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?r1=1.33&r2=1.34

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	12 Oct 2014 16:54:16 -0000	1.33
+++ ChangeLog	22 Oct 2014 14:00:57 -0000	1.34
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/liblastfm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.33 2014/10/12 16:54:16 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.34 2014/10/22 14:00:57 kensington Exp $
+
+  22 Oct 2014; Michael Palimaka <kensington@gentoo.org> liblastfm-1.0.9.ebuild:
+  Ensure build against at least one Qt version wrt bug #526472.
 
   12 Oct 2014; Michael Palimaka <kensington@gentoo.org> liblastfm-1.0.9.ebuild:
   Import Qt5 support from KDE overlay.





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-libs/liblastfm: liblastfm-1.0.9.ebuild ChangeLog
@ 2015-01-30 21:24 Johannes Huber (johu)
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2015-01-30 21:24 UTC (permalink / raw
  To: gentoo-commits

johu        15/01/30 21:24:53

  Modified:             liblastfm-1.0.9.ebuild ChangeLog
  Log:
  Shorten pkg setup.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

Revision  Changes    Path
1.4                  media-libs/liblastfm/liblastfm-1.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild?r1=1.3&r2=1.4

Index: liblastfm-1.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- liblastfm-1.0.9.ebuild	22 Oct 2014 14:00:57 -0000	1.3
+++ liblastfm-1.0.9.ebuild	30 Jan 2015 21:24:53 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.3 2014/10/22 14:00:57 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.9.ebuild,v 1.4 2015/01/30 21:24:53 johu Exp $
 
 EAPI=5
 
@@ -49,13 +49,7 @@
 RESTRICT="test"
 
 pkg_setup() {
-	MULTIBUILD_VARIANTS=()
-	if use qt4; then
-		MULTIBUILD_VARIANTS+=(qt4)
-	fi
-	if use qt5; then
-		MULTIBUILD_VARIANTS+=(qt5)
-	fi
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_configure() {



1.35                 media-libs/liblastfm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/liblastfm/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	22 Oct 2014 14:00:57 -0000	1.34
+++ ChangeLog	30 Jan 2015 21:24:53 -0000	1.35
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/liblastfm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.34 2014/10/22 14:00:57 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.35 2015/01/30 21:24:53 johu Exp $
+
+  30 Jan 2015; Johannes Huber <johu@gentoo.org> liblastfm-1.0.9.ebuild:
+  Shorten pkg setup.
 
   22 Oct 2014; Michael Palimaka <kensington@gentoo.org> liblastfm-1.0.9.ebuild:
   Ensure build against at least one Qt version wrt bug #526472.





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-01-30 21:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-12 16:54 [gentoo-commits] gentoo-x86 commit in media-libs/liblastfm: liblastfm-1.0.9.ebuild ChangeLog Michael Palimaka (kensington)
  -- strict thread matches above, loose matches on Subject: below --
2015-01-30 21:24 Johannes Huber (johu)
2014-10-22 14:00 Michael Palimaka (kensington)
2014-10-05 23:53 Manuel Rueger (mrueg)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox