commit: 96a193835c5436dd9fc192be3436e0b818dc2632 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Mar 22 18:16:41 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Mar 22 18:38:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a19383
media-libs/libmygpo-qt: Drop USE=qt4,qt5 and multibuild Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild | 67 +++++--------------------- 1 file changed, 12 insertions(+), 55 deletions(-) diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild index 6a6e0b5b0b2..bbdf31f17c5 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils multibuild + +inherit cmake-utils DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; @@ -17,66 +18,22 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="+qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="test" RDEPEND=" - qt4? ( - >=dev-libs/qjson-0.5[qt4(+)] - dev-qt/qtcore:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 " DEPEND="${RDEPEND} virtual/pkgconfig - test? ( - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) + test? ( dev-qt/qttest:5 ) " -DOCS=( AUTHORS README ) - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) - if use qt5; then - ewarn "Please note that Qt5 support is still experimental." - ewarn "If you find anything to not work with Qt5, please report a bug." - fi -} - src_configure() { - myconfigure() { - local mycmakeargs=( - -DMYGPO_BUILD_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 -} + local mycmakeargs=( + -DBUILD_WITH_QT4=OFF + -DMYGPO_BUILD_TESTS=$(usex test) + ) -src_install() { - multibuild_foreach_variant cmake-utils_src_install + cmake-utils_src_configure }
