| 1 |
commit: a77c72fedeb1e6bd3c688885384592065e583c66 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 23 23:27:10 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 31 14:57:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a77c72fe |
| 7 |
|
| 8 |
*/*: Switch qt proj packages to cmake.eclass |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
app-emulation/q4wine/q4wine-9999.ebuild | 4 ++-- |
| 13 |
dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild | 8 ++++---- |
| 14 |
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 12 ++++++------ |
| 15 |
3 files changed, 12 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild |
| 18 |
index 65ba08af..ca703546 100644 |
| 19 |
--- a/app-emulation/q4wine/q4wine-9999.ebuild |
| 20 |
+++ b/app-emulation/q4wine/q4wine-9999.ebuild |
| 21 |
@@ -3,7 +3,7 @@ |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
-inherit xdg cmake-utils git-r3 |
| 26 |
+inherit xdg cmake git-r3 |
| 27 |
|
| 28 |
# Upstream names the package PV-rX. We change that to |
| 29 |
# PV_pX so we can use portage revisions. |
| 30 |
@@ -54,5 +54,5 @@ src_configure() { |
| 31 |
-DUSE_GZIP=OFF |
| 32 |
-DWITH_DBUS=$(usex dbus ON OFF) |
| 33 |
) |
| 34 |
- cmake-utils_src_configure |
| 35 |
+ cmake_src_configure |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild |
| 39 |
index b6972c0a..66bd087c 100644 |
| 40 |
--- a/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild |
| 41 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild |
| 42 |
@@ -15,7 +15,7 @@ else |
| 43 |
fi |
| 44 |
PYTHON_COMPAT=( python2_7 ) |
| 45 |
USE_RUBY="ruby25 ruby26" |
| 46 |
-inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
| 47 |
+inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
| 48 |
|
| 49 |
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" |
| 50 |
HOMEPAGE="https://www.qt.io/" |
| 51 |
@@ -119,7 +119,7 @@ src_configure() { |
| 52 |
-DENABLE_PRINT_SUPPORT=$(usex printsupport) |
| 53 |
-DENABLE_DEVICE_ORIENTATION=$(usex orientation) |
| 54 |
-DENABLE_WEBKIT2=$(usex qml) |
| 55 |
- $(cmake-utils_use_find_package webp WebP) |
| 56 |
+ $(cmake_use_find_package webp WebP) |
| 57 |
-DENABLE_X11_TARGET=$(usex X) |
| 58 |
) |
| 59 |
|
| 60 |
@@ -129,11 +129,11 @@ src_configure() { |
| 61 |
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) |
| 62 |
fi |
| 63 |
|
| 64 |
- cmake-utils_src_configure |
| 65 |
+ cmake_src_configure |
| 66 |
} |
| 67 |
|
| 68 |
src_install() { |
| 69 |
- cmake-utils_src_install |
| 70 |
+ cmake_src_install |
| 71 |
|
| 72 |
# bug 572056 |
| 73 |
if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then |
| 74 |
|
| 75 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 76 |
index 307335c3..5cfb0ac6 100644 |
| 77 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 78 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 79 |
@@ -8,18 +8,18 @@ if [[ ${PV} = *9999 ]]; then |
| 80 |
EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git" |
| 81 |
inherit git-r3 |
| 82 |
else |
| 83 |
- SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz" |
| 84 |
+ SRC_URI="https://github.com/annulen/webkit/releases/download/${P}/${P}.tar.xz" |
| 85 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 86 |
fi |
| 87 |
PYTHON_COMPAT=( python2_7 ) |
| 88 |
USE_RUBY="ruby25 ruby26" |
| 89 |
-inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
| 90 |
+inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs |
| 91 |
|
| 92 |
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" |
| 93 |
HOMEPAGE="https://www.qt.io/" |
| 94 |
|
| 95 |
LICENSE="BSD LGPL-2+" |
| 96 |
-SLOT="5/9999" |
| 97 |
+SLOT="5/5.9999" |
| 98 |
IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" |
| 99 |
|
| 100 |
REQUIRED_USE=" |
| 101 |
@@ -117,7 +117,7 @@ src_configure() { |
| 102 |
-DENABLE_PRINT_SUPPORT=$(usex printsupport) |
| 103 |
-DENABLE_DEVICE_ORIENTATION=$(usex orientation) |
| 104 |
-DENABLE_WEBKIT2=$(usex qml) |
| 105 |
- $(cmake-utils_use_find_package webp WebP) |
| 106 |
+ $(cmake_use_find_package webp WebP) |
| 107 |
-DENABLE_X11_TARGET=$(usex X) |
| 108 |
) |
| 109 |
|
| 110 |
@@ -127,11 +127,11 @@ src_configure() { |
| 111 |
mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) |
| 112 |
fi |
| 113 |
|
| 114 |
- cmake-utils_src_configure |
| 115 |
+ cmake_src_configure |
| 116 |
} |
| 117 |
|
| 118 |
src_install() { |
| 119 |
- cmake-utils_src_install |
| 120 |
+ cmake_src_install |
| 121 |
|
| 122 |
# bug 572056 |
| 123 |
if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then |
Archives