From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-665178-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 84A32138B43 for <garchives@archives.gentoo.org>; Thu, 6 Feb 2014 13:32:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C130CE0DB7; Thu, 6 Feb 2014 13:32:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E15B2E0DB9 for <gentoo-commits@lists.gentoo.org>; Thu, 6 Feb 2014 13:32:01 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EC8833F8A1 for <gentoo-commits@lists.gentoo.org>; Thu, 6 Feb 2014 13:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D3EEE18875 for <gentoo-commits@lists.gentoo.org>; Thu, 6 Feb 2014 13:31:58 +0000 (UTC) From: "Michael Palimaka" <kensington@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org> Message-ID: <1391693195.15656288e22c547d0e4928f9a3d0a30aa66a70a5.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/attica/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/attica/attica-9999.ebuild X-VCS-Directories: kde-frameworks/attica/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 15656288e22c547d0e4928f9a3d0a30aa66a70a5 X-VCS-Branch: master Date: Thu, 6 Feb 2014 13:31:58 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f4be8e1c-a398-4526-b4c1-df9658c4d993 X-Archives-Hash: 618c635957583c766bf0bfbebd159084 commit: 15656288e22c547d0e4928f9a3d0a30aa66a70a5 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu Feb 6 13:26:35 2014 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Feb 6 13:26:35 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=15656288 [kde-frameworks/attica] Package is now Qt5-only. Package-Manager: portage-2.2.7 --- kde-frameworks/attica/attica-9999.ebuild | 72 ++------------------------------ 1 file changed, 4 insertions(+), 68 deletions(-) diff --git a/kde-frameworks/attica/attica-9999.ebuild b/kde-frameworks/attica/attica-9999.ebuild index ada1555..2073c04 100644 --- a/kde-frameworks/attica/attica-9999.ebuild +++ b/kde-frameworks/attica/attica-9999.ebuild @@ -4,78 +4,14 @@ EAPI=5 -FRAMEWORKS_AUTODEPS="false" -FRAMEWORKS_TEST="false" -inherit kde-frameworks multibuild +inherit kde-frameworks DESCRIPTION="Framework providing access to Open Collaboration Services" LICENSE="LGPL-2.1+" KEYWORDS="" -IUSE="debug +qt4 qt5 test" - -REQUIRED_USE="|| ( qt4 qt5 )" +IUSE="debug test" RDEPEND=" - qt4? ( dev-qt/qtcore:4 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - !<dev-libs/libattica-9999 -" -DEPEND="${RDEPEND} - qt5? ( - dev-libs/extra-cmake-modules - dev-qt/qtconcurrent:5 - ) - test? ( - qt4? ( - dev-qt/qtgui:4 - dev-qt/qttest:4 - ) - qt5? ( - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - ) - ) + dev-qt/qtnetwork:5 " - -pkg_setup() { - kde-frameworks_pkg_setup - - MULTIBUILD_VARIANTS=() - if use qt4; then - MULTIBUILD_VARIANTS+=(qt4) - fi - if use qt5; then - MULTIBUILD_VARIANTS+=(qt5) - fi -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - ) - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON" - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=OFF" - fi - kde-frameworks_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant kde-frameworks_src_compile -} - -src_install() { - multibuild_foreach_variant kde-frameworks_src_install -} - -src_test() { - multibuild_foreach_variant kde-frameworks_src_test -} +DEPEND="${RDEPEND}"