public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: app-emulation/q4wine/, dev-qt/qtwebkit/
@ 2019-12-31 16:44 Andreas Sturmlechner
  0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2019-12-31 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     a77c72fedeb1e6bd3c688885384592065e583c66
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 23:27:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-12-31 16:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-31 16:44 [gentoo-commits] proj/qt:master commit in: app-emulation/q4wine/, dev-qt/qtwebkit/ Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox