From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA7861382C5 for ; Thu, 22 Mar 2018 18:38:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF5CEE0991; Thu, 22 Mar 2018 18:38:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6395E0950 for ; Thu, 22 Mar 2018 18:38:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 326F9335C36 for ; Thu, 22 Mar 2018 18:38:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44F11258 for ; Thu, 22 Mar 2018 18:38:15 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1521743881.96a193835c5436dd9fc192be3436e0b818dc2632.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmygpo-qt/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild X-VCS-Directories: media-libs/libmygpo-qt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 96a193835c5436dd9fc192be3436e0b818dc2632 X-VCS-Branch: master Date: Thu, 22 Mar 2018 18:38:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 92a7b606-4e44-4e2f-af7f-4ef770b8355f X-Archives-Hash: 4d00c6e2bca9e7f2cf7acc499e9d1202 commit: 96a193835c5436dd9fc192be3436e0b818dc2632 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 22 18:16:41 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 }