gentoo resync : 28.04.2018

3 files changed, 2 insertions, 88 deletions

diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 1853fd7a1738..d6bffff0dca1 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,6 +1,4 @@
 AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb
-DIST liblastfm-1.0.9.tar.gz 119320 BLAKE2B 4c661b703af1e94b42d2bddffd994e0d33360979e47e0079f3824a9febcdba22c3ccedd8599da5c1d4b701a329cb4779bd680181837152cb1d23a231ec6eee73 SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018
 DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
-EBUILD liblastfm-1.0.9-r1.ebuild 1713 BLAKE2B 6f97bd3c43a5435b3b5e793966e71a8f23406589b9457b5d1715e6c6d364e9212616b4b1e74619b3f901b0b0f64d6105d9bff897b8586bac5c5693392a704614 SHA512 08262b6e37da21b66d869504c671cb46d4402a204a705571adac67bcc70b9bafad389905c8ec339196927580c0de3994113bc73ac6c41d365c4a1d1bc4a3de5b
-EBUILD liblastfm-1.1.0_pre20150206.ebuild 1067 BLAKE2B 3a511140f786137ff95137efc75e2715978d67e5aae850f6949fd58f950dedfe150e873383c73ea17c146de2e216a97701e509b07bc4debc8f5141431010c25a SHA512 ea439b4e081b9089c856cd85cde0fb16e0e6dacff23f4a9aa35fdc17f10f3a69dc4291e88516cd0acbd1c91b5e67867b20ea6aa05023ef26356efb6638e414a6
+EBUILD liblastfm-1.1.0_pre20150206.ebuild 1065 BLAKE2B 79f25b42a5a1bdfdfb965c47324e911385454fd165ab883412bd34707c86bcf4d81d7235ca11ad21d7686d6547d14298d3d2ddc79f2c5d754bdde781a4381e63 SHA512 e41ce9dbfe6a81eba89deb6b1f92d13cd01a0f46fa73003fd6d2fa3f274fb516386daae2d67898a2cac0a4e5464d5f8c6682bb133dd34769ad3fc67998637bfc
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild b/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild
deleted file mode 100644
index b4aedd844173..000000000000
--- a/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multibuild
-
-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"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0/0"
-IUSE="fingerprint test +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-COMMON_DEPEND="
-	qt4? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtdbus:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtxml:5
-	)
-	fingerprint? (
-		media-libs/libsamplerate
-		sci-libs/fftw:3.0
-		qt4? ( dev-qt/qtsql:4 )
-		qt5? ( dev-qt/qtsql:5 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/lastfmlib-0.4.0
-"
-
-# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
-RESTRICT="test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	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_QT4=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
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index b20109621436..a9a4e77d96ae 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/lastfm/liblastfm"
 SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0/0"
 IUSE="fingerprint test"