From 5f7ab1d0350672c2d9f6c90793c32e57aaec34b6 Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <ionen@gentoo.org>
Date: Sat, 19 Aug 2023 22:24:12 -0400
Subject: dev-qt/*: streamline style a bit across qt6 ebuilds

Misc minor adjustments / sorting, but more commonly:

* use same RDEPEND + DEPEND ordering everywhere, bit of both
  order is used all across and sometime inverted in Qt5's so
  let's match skel.ebuild to avoid confusion
* use explicit :6 slots, not necessary with =PV but this is more
  about normalizing usage when multiple slots exist (plus *cough*
  qa-vdb won't complaint anymore)

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---
 dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 49 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'dev-qt/qtwebengine/qtwebengine-6.9999.ebuild')

diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index bad90757778b..c7527f95be63 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="114.0.5735.133"
-
 inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
 
+CHROMIUM_VER=108.0.5359.181
+CHROMIUM_PATCHES_VER=114.0.5735.133
+
 DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -17,20 +17,11 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 IUSE="
-	alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
-	+system-icu widgets
+	alsa bindist designer geolocation +jumbo-build kerberos
+	pulseaudio screencast +system-icu widgets
 "
 REQUIRED_USE="designer? ( widgets )"
 
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-"
 RDEPEND="
 	app-arch/snappy:=
 	dev-libs/glib:2
@@ -41,8 +32,8 @@ RDEPEND="
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
 	dev-libs/re2:=
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtwebchannel-${PV}*
+	=dev-qt/qtdeclarative-${PV}*:6
+	=dev-qt/qtwebchannel-${PV}*:6
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/harfbuzz:=
@@ -74,24 +65,36 @@ RDEPEND="
 	x11-libs/libxshmfence:=
 	x11-libs/libXtst
 	alsa? ( media-libs/alsa-lib )
-	geolocation? ( =dev-qt/qtpositioning-${PV}* )
+	geolocation? ( =dev-qt/qtpositioning-${PV}*:6 )
 	kerberos? ( virtual/krb5 )
 	pulseaudio? ( media-libs/libpulse:= )
 	screencast? ( media-video/pipewire:= )
 	system-icu? ( >=dev-libs/icu-69.1:= )
 	widgets? (
-		=dev-qt/qtbase-${PV}*[widgets]
+		=dev-qt/qtbase-${PV}*:6[widgets]
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	media-libs/libglvnd
 "
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+"
 
 python_check_deps() {
 	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
 }
 
 qtwebengine_check-reqs() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
 	# bug #307861
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
@@ -101,8 +104,6 @@ qtwebengine_check-reqs() {
 	fi
 	eshopts_pop
 
-	[[ ${MERGE_TYPE} == binary ]] && return
-
 	# (check-reqs added for bug #570534)
 	#
 	# Estimate the amount of RAM required
@@ -186,8 +187,8 @@ src_prepare() {
 }
 
 src_configure() {
-	export NINJA_PATH="${BROOT}"/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+	export NINJA_PATH=${BROOT}/usr/bin/ninja
+	export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}
 
 	local mycmakeargs=(
 		#-DQT_FEATURE_accessibility=off
-- 
cgit v1.2.3