commit: 53aa22370d836b0c36c9a68f59ec8efb2ba9806a Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Mon Mar 19 20:58:40 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Mon Mar 19 20:58:40 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=53aa2237
media-libs/liblastfm: Drop Qt4 support Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/liblastfm/liblastfm-9999.ebuild | 68 +++++++----------------------- 1 file changed, 16 insertions(+), 52 deletions(-) diff --git a/media-libs/liblastfm/liblastfm-9999.ebuild b/media-libs/liblastfm/liblastfm-9999.ebuild index 69cc347346..3c315d12c2 100644 --- a/media-libs/liblastfm/liblastfm-9999.ebuild +++ b/media-libs/liblastfm/liblastfm-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit cmake-utils multibuild git-r3 +inherit cmake-utils git-r3 DESCRIPTION="Collection of libraries to integrate Last.fm services" HOMEPAGE="https://github.com/lastfm/liblastfm"; @@ -12,33 +12,21 @@ EGIT_REPO_URI=( "https://github.com/lastfm/${PN}"; ) LICENSE="GPL-3" KEYWORDS="" SLOT="0/0" -IUSE="fingerprint qt4 +qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="fingerprint test" COMMON_DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtxml:5 fingerprint? ( + dev-qt/qtsql:5 media-libs/libsamplerate sci-libs/fftw:3.0 - qt4? ( dev-qt/qtsql:4 ) - qt5? ( dev-qt/qtsql:5 ) - ) - 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 ) " DEPEND="${COMMON_DEPEND} - test? ( - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) + test? ( dev-qt/qttest:5 ) " RDEPEND="${COMMON_DEPEND} !<media-libs/lastfmlib-0.4.0 @@ -47,38 +35,14 @@ RDEPEND="${COMMON_DEPEND} # 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 - -DBUILD_FINGERPRINT=$(usex fingerprint) - -DBUILD_TESTS=$(usex test) - ) - 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 -} + # demos not working + local mycmakeargs=( + -DBUILD_DEMOS=OFF + -DBUILD_WITH_QT4=OFF + -DBUILD_FINGERPRINT=$(usex fingerprint) + -DBUILD_TESTS=$(usex test) + ) -src_install() { - multibuild_foreach_variant cmake-utils_src_install + cmake-utils_src_configure }
