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 8351A138334 for ; Tue, 31 Dec 2019 16:44:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B580CE0B1C; Tue, 31 Dec 2019 16:44:04 +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 79C36E0B1C for ; Tue, 31 Dec 2019 16:44:04 +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 A53D834DDE9 for ; Tue, 31 Dec 2019 16:44:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38CB836 for ; Tue, 31 Dec 2019 16:44:00 +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: <1577804273.a77c72fedeb1e6bd3c688885384592065e583c66.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: app-emulation/q4wine/, dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: app-emulation/q4wine/q4wine-9999.ebuild dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.9999.ebuild X-VCS-Directories: app-emulation/q4wine/ dev-qt/qtwebkit/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a77c72fedeb1e6bd3c688885384592065e583c66 X-VCS-Branch: master Date: Tue, 31 Dec 2019 16:44:00 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b0789938-a4d7-4281-9cb6-7351df4f0a6a X-Archives-Hash: 81001fa4ca528407dd8c3d65ed21081c commit: a77c72fedeb1e6bd3c688885384592065e583c66 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 23 23:27:10 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 31 14:57:53 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a77c72fe */*: Switch qt proj packages to cmake.eclass Signed-off-by: Andreas Sturmlechner gentoo.org> app-emulation/q4wine/q4wine-9999.ebuild | 4 ++-- dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild | 8 ++++---- dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild index 65ba08af..ca703546 100644 --- a/app-emulation/q4wine/q4wine-9999.ebuild +++ b/app-emulation/q4wine/q4wine-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit xdg cmake-utils git-r3 +inherit xdg cmake git-r3 # Upstream names the package PV-rX. We change that to # PV_pX so we can use portage revisions. @@ -54,5 +54,5 @@ src_configure() { -DUSE_GZIP=OFF -DWITH_DBUS=$(usex dbus ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild index b6972c0a..66bd087c 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild @@ -15,7 +15,7 @@ else fi PYTHON_COMPAT=( python2_7 ) USE_RUBY="ruby25 ruby26" -inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs +inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" HOMEPAGE="https://www.qt.io/" @@ -119,7 +119,7 @@ src_configure() { -DENABLE_PRINT_SUPPORT=$(usex printsupport) -DENABLE_DEVICE_ORIENTATION=$(usex orientation) -DENABLE_WEBKIT2=$(usex qml) - $(cmake-utils_use_find_package webp WebP) + $(cmake_use_find_package webp WebP) -DENABLE_X11_TARGET=$(usex X) ) @@ -129,11 +129,11 @@ src_configure() { mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install # bug 572056 if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 307335c3..5cfb0ac6 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -8,18 +8,18 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git" inherit git-r3 else - SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz" + SRC_URI="https://github.com/annulen/webkit/releases/download/${P}/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi PYTHON_COMPAT=( python2_7 ) USE_RUBY="ruby25 ruby26" -inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs +inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" HOMEPAGE="https://www.qt.io/" LICENSE="BSD LGPL-2+" -SLOT="5/9999" +SLOT="5/5.9999" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE=" @@ -117,7 +117,7 @@ src_configure() { -DENABLE_PRINT_SUPPORT=$(usex printsupport) -DENABLE_DEVICE_ORIENTATION=$(usex orientation) -DENABLE_WEBKIT2=$(usex qml) - $(cmake-utils_use_find_package webp WebP) + $(cmake_use_find_package webp WebP) -DENABLE_X11_TARGET=$(usex X) ) @@ -127,11 +127,11 @@ src_configure() { mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install # bug 572056 if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then