media-libs/liblastfm: Drop patch in favour of cmake-utils.eclass function, thanks kensington for the hint

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 24 insertions, 38 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/Manifest b/media-libs/liblastfm/Manifest
index 5239d7129975..ffdf13e50755 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -2,29 +2,28 @@
 Hash: SHA512
 
 AUX liblastfm-0.3.3-ruby-1.9-fix.patch 709 SHA256 2b48625cf97aef626fa1b00e6e233d40ca567e0715613a572d0570900c9cae3d SHA512 626826ccb8041910f2d998136e939e07acf42afad6378ffc87b8b18f8e7df0dc17cccbc00582e1b801c60a2208c91c0a4091c101b5808d654360cefd2ff10c28 WHIRLPOOL a29ff8eaf65a838d1bdf0177dc36d574e65c8b185b380ce15083f4465bb5c3f0ec2520853d491d9a8c80133d1d74475810a8cd6943db19deb86285388fb0c712
-AUX liblastfm-1.0.7-QT4_BUILD.patch 648 SHA256 b834b875a19f14fd8bfb17790fe8417322ae8778654f63fdd1469082d4bb6e3f SHA512 452611de425a63cf7e100839afd72f60724300b507c03cfcc2508cf1f720ef341e91cfad89bb6d7844c501b1ed17f0996d6a2d3b4a02e2a6f17c80cb34776db9 WHIRLPOOL c1480c2e8b1e4d16cce630192d1ee66efaacd7519abbee4fe4845b44c99f22695facdb8242b20233fcb41840b6a4ae8c75a586b2f69a56f16fac8a8ff56fadaa
 DIST liblastfm-0.3.3.tar.gz 111700 SHA256 2607ba6c1495bae8c0f93df1e6271ba5c4503ee53e5657d815fdd584e4df636c
 DIST liblastfm-1.0.3.tar.gz 119113 SHA256 3bf7831912907decf1998b299d95a2acd0fc9575eaf06b52a2116a2788652c0c SHA512 8cc43602a0cfc7d0a17dac1885c0702e01e73215dcae4a50604f73fa7894d483c9078c0a601a0a0a17da532479073df3e9fdb9e8e85df39a5bf384b9a6ed08dd WHIRLPOOL b52043c86baebcdc9c87171afef05ec49d970fa42364740bb2d0f99fac1b4726dcf64cfb519ef8e519838aff767d50cd98c4decb3e26b6977cd16f20cca5f35f
 DIST liblastfm-1.0.7.tar.gz 118483 SHA256 670b21c29eee4a243fed753e1bef2e15a6454fdf9feac7b925125129228410de SHA512 cf761d5e5b3f98ba375cb6670d1309b2851e8575384cd643729eb95024e478994a1eb0d52b1a5f3f43be5f13ace299553a1ddfa37bb147d77cea130ccd336acb WHIRLPOOL d45f9b576a2968be1d869c69eb33dd68107c450a6a5f89401b3a7c71b92199e051cb0b44b2d5bfd9ba6b039ef2e66a11d29b52e401563f74051c33fa17da39fb
 EBUILD liblastfm-0.3.3.ebuild 1430 SHA256 0cc57713e7c27d0b274f20e164e3643736814ac24af010065d1141a7f40700b3 SHA512 638183182c09d005a71374ef92cff9f61881718240065e791ff5601fd5d2f197dff22a755014424eaaef2e87ff7ac69c173efc9695704d28762d630f973b4b7f WHIRLPOOL b0af14a548e66bb80576c5ad08ae861d8c19f447bcb96fb5ee126e857a72503e60abb2e150e83bdfacad86c6209841940ef9120ac4da7ba34ae90e0034891645
 EBUILD liblastfm-1.0.3.ebuild 1096 SHA256 087bd5c8e3839f65cee32e1f3ffe5e2c9e76a57de9ad2994a50d4fc6c3e30d89 SHA512 536e910608201d05b8c8f34be79608f6e740545c9d2c8e6d2b79804bde58e689a75bdeab6e888d1f10d78829f9171d4d2b11be23df835f71f913bbbdd94bb67b WHIRLPOOL fb12095c6d6f274fad99f1e0cfaad0586bb4e701136355490cb74e0ccd5843f5409a2890b9f47780d2ba5573d98d56e2a8fc5828445f5e103b4df7192541576e
-EBUILD liblastfm-1.0.7.ebuild 1236 SHA256 82d27b4d74005d61ccfa0faf91556ed2b5d4f8a227de43e763c76f7643aca63e SHA512 74bed1b7111217f03c36933292953ddd61d855aa684d54c74bedf3364af603f99f0ba8f2f87330175ede4f939ff562652d04efb83e665e49c02ad0d0374bf790 WHIRLPOOL 0df130c3144364e8f543b3ae5e040f825488b4b3cc3a64967043f78afc5fd13eaa7f672c61afc99deb5482882f026a8f65c3331fd6f5d0b0e2cdd4030e9551f7
-MISC ChangeLog 3502 SHA256 72c0cdab61a1cfa6d352aec09e1cbda41ff4b68e9e51d076e78777b424544d18 SHA512 7db5c4b8e0b200f1f1a0d1e6fd67051127a5962a7d7550b4cf3d2b4753f90ddf417aee08d34de20035c3a6498130eb1df547939025bff896efe03e269a6e77f4 WHIRLPOOL 423d49bf5f4b95f13d1c8e5bfa6c56a29aa25efb34cee2ef8d40e3e56ccda06636aa68430579f8b56e9f911e4aa2b42da03bb45501b359a3f27449805d7666eb
+EBUILD liblastfm-1.0.7.ebuild 1222 SHA256 78968e4a5cfcdec0291bf49bfd3aff4fdeab7aea288fe035d6afd985a056b5e1 SHA512 30804fd6abd6ccc7264a2dccfaac8aebbfcb8f61a25d25bb9e1f6bf3fa58ed79ac8eea0827a4db205a4106ecb6349712a3a7291993dc9b585a333678ea42e1bf WHIRLPOOL a1fbea5901e428654ecaaf7132a02d2ea3d8ac03904fd59a81d0104ce6e1969bf6d6f71224af153ce0b768c8ca897b0076b0afe9c82d078d7bc597debd03c271
+MISC ChangeLog 3704 SHA256 240f2b140c0e5e4dd4d91c113af37b6cbb4e86ea7c67630a0356bf0a322f8a62 SHA512 1fa19bc279ec514b3fc85ce2b7b83c0716c8b738a452fefe3240c31fc52fa1200ee58ed3cbd41ca3dd7e283cfdd059e04600573b7894669dae6da81eb5c76531 WHIRLPOOL 021e1371839763a52c6115e580a5b2a56fa5ee9dc189f7d4584f67be4cc721a66383f3c1cd92ae19a95230a432a7c10bb44507eb4a1287e2af90d9bca1f31ca4
 MISC metadata.xml 248 SHA256 8fd471c7b258d3a36227fa8af8c3fe27e874bbc3e1c0e309cc8c3db49fecab7e SHA512 fb0e12b9f75d0e413288445c3fd9397b8dd29969f044f55f65f5f9c5b48394fec49770ad2d317d76a781d6c6b2a37a9934f5c07036a112bb051bab143660cd05 WHIRLPOOL addea7d9c4f14a95bf8d5f5b3e2dd505228ac06396a4aca909010ac2cdcb65cc5e89c39e653fb24eed217d1fde2f04a2c526032caff7fa1f9d9c7c5288b27ab1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSC1KPAAoJELnU8jG9FVirxEsP/2TbNHKQVwaSmYBzXg0qKz7T
-JYs8QFQ9+EvsThJcsYI97NMXdtvlYlTM+YuFhluDbRQy2vSz157XjkWPKiKQZ/+4
-0dszL/eeV2uYyH3Wl0WlGlKEiu+ZRHtxE3scWOu8ZPFDow7xw3gRNJ6I9JtXaoXd
-rVT24ImnvUAiwk/G8XUDIrBm8neHhriqxPWQn5Am/ALPNIhjROZsYxEIazx2I6Zi
-zikFhiGkAo4hve1XF1vtA9itoidthrqb56kUK2OKEf8wL4ipCygzghuh3RZVnH8u
-Ja63AwgTPr9nVbm51kHi1cOotc/vuU17MmWo+8fcXJrxusux2qTcMzAryKpOrfsc
-E1dy9JK1q5Cv0iublSGMTIShhCI8muP1Osm9sEGFvwABbH6N0YsKE+MV+iTaWJ8+
-kuTfQx1qOpU7R8GErX9RZ2DQStp66px5V4mBbRgmRNSsztZ2ioGrZ9LP3SuOS/LA
-LsKBscFzxLgBnh+fk1isqLLdxJ9vdPVlIXnJPmjCQ4ryIIfmgR7ZSLduzHBGB5JN
-3PDqyZ1oWtsJNJYZCTY+8C94kQj6A8IhHwWEsyusSIM1n2sRCGV74INxCzJakNRD
-oYg5mh1dFAwevzP9xquYXRUCB6BbcNc/FasYgwhp7CJorXuMg//oVxxQ3p5wvuxL
-6IAPSc10L+2/jZ4EA6dP
-=0Cg+
+iQIcBAEBCgAGBQJSC1S8AAoJELnU8jG9FVirKdsP+wfhI1XQxjSZsFNbhuFnL1AD
++LtFqRJHxbjvfKWbLoIV9pJkPeK4B2hx/BMfM7Ro+me0JJ37I1wVWRnVdfr3W8AC
+ZYdMR2U1oZuhqSrN0PRmYm3UnBEWHP3D+Ooy9Tjmc4Bv9ZZ/d+GVyiQrjvwT63/N
+JfIHdeW4KZ9EFsK5TV9kY9vWzDAjwgzyj9nd4yL01qwNGmzerXnlpImjXtY07FIU
+8JpjFnFPjolQupVtQHP4xbvmBWeEwXUmBE6/6atXKK4PKaO6FHie2yVK95CwgF37
+4e11xW2uzjmnfxiWTKRr1cJSMQAzn2etwSC7+pNpM4O5U6u8kjSvcVWeaSNAuUij
+GsnbyZoBaG3z3J/LrOBIrVvxteOisjTEWDuZkbOAD7L8vdUqHSUIAPK0oDdn+8E0
+z9udX5y4WTrwN56MrTehtogRWIBcvsm31ghHliBGRDB5mcS/7xdJBUr7XgR0EcCm
+Yi9T17c0yH9yFaJuEX1QSNJYB6KS2wRrjOjlE90tT9ZHZ6l8dK5HvErcChdLEl3o
+aBUtHsCOB6/VzMrzOkU8F7CE7zHRWkFI9IoZEGwcQhmBo4607GxcKs4JsfuYB94S
+YzJC3AL05uFGPTzqxC/oXM/PMDzv/7DI3GIAIni+32wZWH3UVO/OjYjTXEQTCiGM
+QvxbFanq0IaY2pgImn6q
+=ph37
 -----END PGP SIGNATURE-----
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)