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 BFCF9138334 for ; Wed, 29 Aug 2018 10:51:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B654E0841; Wed, 29 Aug 2018 10:51:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6BE6EE0841 for ; Wed, 29 Aug 2018 10:51:53 +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 8AFE3340B1F for ; Wed, 29 Aug 2018 10:51:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 908343BD for ; Wed, 29 Aug 2018 10:51:49 +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: <1535539883.b380b88d8a30c355c68f30ff36fd21f9060186f5.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/krita/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/krita/krita-9999.ebuild X-VCS-Directories: media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b380b88d8a30c355c68f30ff36fd21f9060186f5 X-VCS-Branch: master Date: Wed, 29 Aug 2018 10:51:49 +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: 0cb87c08-b090-47a5-9fc9-d3c1228c2f4f X-Archives-Hash: 3b7683191c586e11308971c37ecbdc22 commit: b380b88d8a30c355c68f30ff36fd21f9060186f5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 29 10:22:00 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 29 10:51:23 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b380b88d media-gfx/krita: Drop USE=python and make it unconditional USE=-python breaks cmake and would need a patch to keep up. Package-Manager: Portage-2.3.48, Repoman-2.3.10 media-gfx/krita/krita-9999.ebuild | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild index 04f2354e07..17fe9fd0e5 100644 --- a/media-gfx/krita/krita-9999.ebuild +++ b/media-gfx/krita/krita-9999.ebuild @@ -16,10 +16,10 @@ fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" LICENSE="GPL-3" -IUSE="color-management fftw gif +gsl +jpeg openexr pdf python qtmedia +raw tiff vc" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND=" +COMMON_DEPEND="${PYTHON_DEPS} $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -45,6 +45,8 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) dev-libs/boost:= + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= @@ -63,11 +65,6 @@ COMMON_DEPEND=" media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) - python? ( - ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - ) qtmedia? ( $(add_qt_dep qtmultimedia) ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) @@ -87,7 +84,8 @@ RDEPEND="${COMMON_DEPEND} RESTRICT+=" test" pkg_setup() { - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup + kde5_pkg_setup } src_configure() { @@ -99,8 +97,6 @@ src_configure() { $(cmake-utils_use_find_package jpeg JPEG) $(cmake-utils_use_find_package openexr OpenEXR) $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package python PyQt5) - $(cmake-utils_use_find_package python SIP) $(cmake-utils_use_find_package qtmedia Qt5Multimedia) $(cmake-utils_use_find_package raw LibRaw) $(cmake-utils_use_find_package tiff TIFF)