[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     f3f5d091ba0372fd683b43a06e62c48983b3df60
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 20:10:47 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 06:35:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f3f5d091

dev-qt/qtwebkit: Re-add live ebuilds (stable branch and -dev)

Development was picked up again, albeit on different locations.

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtwebkit/Manifest                           |  1 -
 ...e20190629.ebuild => qtwebkit-5.212.9999.ebuild} | 23 ++++++++++++----------
 ...0_pre20190629.ebuild => qtwebkit-5.9999.ebuild} | 23 +++++++++++-----------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
deleted file mode 100644
index eaf27bbb..00000000
--- a/dev-qt/qtwebkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild
similarity index 88%
copy from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
copy to dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild
index ce0302f9..b6972c0a 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.9999.ebuild
@@ -3,18 +3,25 @@
 
 EAPI=7
 
+if [[ ${PV} = *9999 ]]; then
+	EGIT_BRANCH="qtwebkit-5.212"
+	EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git"
+	inherit git-r3
+else
+	MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
+	SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24 ruby25 ruby26"
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
+USE_RUBY="ruby25 ruby26"
 inherit check-reqs cmake-utils 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/"
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
@@ -24,7 +31,7 @@ REQUIRED_USE="
 "
 
 # Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
+QT_MIN_VER="5.12.3:5"
 BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
@@ -73,8 +80,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
 _check_reqs() {
@@ -120,10 +125,8 @@ src_configure() {
 
 	if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
 		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
 	else
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
 	fi
 
 	cmake-utils_src_configure

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
similarity index 88%
rename from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
rename to dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index ce0302f9..307335c3 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=7
 
+if [[ ${PV} = *9999 ]]; then
+	EGIT_BRANCH="qtwebkit-dev"
+	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24 ruby25 ruby26"
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
+USE_RUBY="ruby25 ruby26"
 inherit check-reqs cmake-utils 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/"
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
 
 LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+SLOT="5/9999"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
@@ -24,7 +29,7 @@ REQUIRED_USE="
 "
 
 # Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
+QT_MIN_VER="5.12.3:5"
 BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
@@ -73,8 +78,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
 _check_reqs() {
@@ -120,10 +123,8 @@ src_configure() {
 
 	if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
 		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
-	elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
 	else
-		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
 	fi
 
 	cmake-utils_src_configure