diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-08-14 09:58:19 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-08-14 09:58:19 +0000 |
| commit | 7d2d6edc099f5316c053e950fc9c074c3b155ff1 (patch) | |
| tree | 6f7e7652f2dd388f76d5c109aeaed188bf79ba4d /media-libs/liblastfm | |
| parent | media-libs/liblastfm: Version Bump (diff) | |
| download | gentoo-2-7d2d6edc099f5316c053e950fc9c074c3b155ff1.tar.gz gentoo-2-7d2d6edc099f5316c053e950fc9c074c3b155ff1.tar.bz2 gentoo-2-7d2d6edc099f5316c053e950fc9c074c3b155ff1.zip | |
media-libs/liblastfm: Drop patch in favour of cmake-utils.eclass function, thanks kensington for the hint
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'media-libs/liblastfm')
| -rw-r--r-- | media-libs/liblastfm/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/liblastfm/files/liblastfm-1.0.7-QT4_BUILD.patch | 16 | ||||
| -rw-r--r-- | media-libs/liblastfm/liblastfm-1.0.7.ebuild | 8 |
3 files changed, 9 insertions, 22 deletions
diff --git a/media-libs/liblastfm/ChangeLog b/media-libs/liblastfm/ChangeLog index 289aa6977322..40fd5da4f8b1 100644 --- a/media-libs/liblastfm/ChangeLog +++ b/media-libs/liblastfm/ChangeLog @@ -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.24 2013/08/14 09:49:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.25 2013/08/14 09:58:19 jlec Exp $ + + 14 Aug 2013; Justin Lecher <jlec@gentoo.org> liblastfm-1.0.7.ebuild, + -files/liblastfm-1.0.7-QT4_BUILD.patch: + Drop patch in favour of cmake-utils.eclass function, thanks kensington for + the hint *liblastfm-1.0.7 (14 Aug 2013) diff --git a/media-libs/liblastfm/files/liblastfm-1.0.7-QT4_BUILD.patch b/media-libs/liblastfm/files/liblastfm-1.0.7-QT4_BUILD.patch deleted file mode 100644 index 47eb42ae77dc..000000000000 --- a/media-libs/liblastfm/files/liblastfm-1.0.7-QT4_BUILD.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up liblastfm-1.0.7/CMakeLists.txt.QT4_BUILD liblastfm-1.0.7/CMakeLists.txt ---- liblastfm-1.0.7/CMakeLists.txt.QT4_BUILD 2013-02-27 03:01:06.000000000 -0600 -+++ liblastfm-1.0.7/CMakeLists.txt 2013-06-17 07:57:16.458399726 -0500 -@@ -26,7 +26,11 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PA - - # setup qt stuff - set(CMAKE_AUTOMOC ON) --find_package(Qt5Core QUIET) -+ -+option(QT4_BUILD "Force building with Qt4 even if Qt5 is found") -+if (NOT QT4_BUILD) -+ find_package(Qt5Core QUIET) -+endif(NOT QT4_BUILD) - if(Qt5Core_DIR) - message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") - diff --git a/media-libs/liblastfm/liblastfm-1.0.7.ebuild b/media-libs/liblastfm/liblastfm-1.0.7.ebuild index 967cff356631..a243205e5b48 100644 --- a/media-libs/liblastfm/liblastfm-1.0.7.ebuild +++ b/media-libs/liblastfm/liblastfm-1.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.7.ebuild,v 1.1 2013/08/14 09:49:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-1.0.7.ebuild,v 1.2 2013/08/14 09:58:19 jlec Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz SLOT="0" LICENSE="GPL-3" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples fingerprint test" +IUSE="examples fingerprint qt4 test" COMMON_DEPEND=" >=dev-qt/qtcore-${QT_MINIMAL}:4 @@ -35,11 +35,9 @@ RDEPEND="${COMMON_DEPEND} # 1 of 2 is failing, last checked 2012-06-22 / version 1.0.1 RESTRICT="test" -PATCHES=( "${FILESDIR}"/${P}-QT4_BUILD.patch ) - src_configure() { local mycmakeargs=( - -DQT4_BUILD=ON + $(cmake-utils_use_find_package !qt4 Qt5Core) $(cmake-utils_use_build examples DEMOS) $(cmake-utils_use_build fingerprint FINGERPRINT) $(cmake-utils_use_build test TESTS) |