gentoo auto-resync : 15:09:2024 - 12:11:38

3 files changed, 33 insertions, 82 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index fc6228944d4f..e3565da5a63b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,11 +4,11 @@ AUX qgis-3.36.3-qt6-Fix-broken-test.patch 1091 BLAKE2B 5fc073355b71e4cc932c3a3f7
 AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c379159897c508ce5b9a471df0f4ff45a9f9e5511b5fbd7655c0e9137339ebbada1fcba18b65ce2998f3338eecbd55d5 SHA512 f108a26274acb8c7e871aa6dd214897873f31e521f9bc0811404b13d7025a8414c0f50e066afa281d23c085bf8bd846e60e75919f859b4e0456b330ea7728645
 AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a
 DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
+DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.28.10.ebuild 11506 BLAKE2B c97b36829915ca90307b1881ae39945684ad6445bc7bef95c5e64215e9430fea6b6dc4aa286dd36b769fd92ed1d6fa657b335442c1e5fb44fad2ff76fb77cfc5 SHA512 40de0aa4183f1155081e1bf23fecb8e25c200eeb308a4a0b954899e0241ae01395142ccd501dea42bbd3b45255790dbcecc0bce384d909e457ce4ef1886f878d
-EBUILD qgis-3.36.3-r1.ebuild 13296 BLAKE2B e497ec73b97ebe75fb3af133e346afb7cbba032058b0c1f9c76ee8eb2c73004da8df1bcf148154d4b5786770d897ac3d515f512f12e7ea23d17050e026964be7 SHA512 cd9e4548a8bec164d4160fd67044f75fb0554e6113c5a87fa332a19356f5e1247a81d431dab78d5b85e41bf7e48d86bbf0312ebeb9d8ac5fd6636f1cbf9c82cb
+EBUILD qgis-3.28.10.ebuild 11501 BLAKE2B de9db2760f0c4527f6dfd668b0b52006820b0a128ef6b0e3f5c0feee06152e831c54f4d8e271a4741280950e5b1da075fa687b6996593c9e1656c1b6090f8d5c SHA512 a42e3e061ee52f7433d70e37bbfe0a13753090e2630bdf68fa7d4bc8bbfb21ec2e5a7f2b1ea0d8f05a6ae22a5b2ed87b81747266f6f2a249a5f5d81cfe119727
 EBUILD qgis-3.38.0-r1.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e
+EBUILD qgis-3.38.3.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e
 EBUILD qgis-9999.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e
 MISC metadata.xml 1696 BLAKE2B 21bdfb035c471861aea5ab8c4ce2e632bcb6dafa0bd3cd0733a3533288c4a6a8f2e5e313a39db8757f11f204d15ca73b3d9b779f3156e7682293db58d24ec20b SHA512 189003c5dec06dd14c57bff372b656dfa5e5febc942ef418782d31f80eeab0d93c7e44bc850719543f5de6b1e08a3e2b2c1596b964d58c942e35441f913b43c3
diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index 6b2233260c1e..bff6a620ed00 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
diff --git a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild
index 43309edb502c..0284f8d105e8 100644
--- a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
@@ -25,23 +25,30 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	mapserver? ( python )
-	qt6? ( polar )
-	test? ( postgres )
 "
+# 	test? ( postgres )
 
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtpositioning:6
+	dev-qt/qtserialport:6
+	dev-qt/qtsvg:6
 	dev-vcs/git
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
@@ -49,6 +56,9 @@ COMMON_DEPEND="
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
 	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[qt6]
+	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)]
+	3d? ( dev-qt/qt3d:6 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( sci-geosciences/grass:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -77,73 +87,15 @@ COMMON_DEPEND="
 			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
 		')
 	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
-		dev-qt/qtmultimedia:6
-		dev-qt/qtpositioning:6
-		dev-qt/qtserialport:6
-		dev-qt/qtsvg:6
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
 "
 DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
 	test? (
 		python? (
 			app-text/qpdf
@@ -155,20 +107,14 @@ RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
 BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
+	dev-qt/qttools:6[linguist]
 	app-alternatives/yacc
 	app-alternatives/lex
 	doc? ( app-text/doxygen )
 	test? (
 		python? (
 			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
 				dev-python/nose2[${PYTHON_USEDEP}]
 				dev-python/mock[${PYTHON_USEDEP}]
 			')
@@ -177,7 +123,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
+	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
 	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
 	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
 )
@@ -219,7 +165,7 @@ src_configure() {
 
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
-		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT6=ON
 		-DWITH_ANALYSIS=ON
 		-DWITH_APIDOC=$(usex doc)
 		-DWITH_GUI=ON
@@ -233,7 +179,8 @@ src_configure() {
 		$(cmake_use_find_package netcdf NetCDF)
 		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_QWTPOLAR=ON
+		-DWITH_QTWEBENGINE=$(usex webengine)
 		-DWITH_PDAL=$(usex pdal)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
@@ -298,6 +245,10 @@ src_configure() {
 }
 
 src_test() {
+	addwrite "/proc/self/mem"
+	addwrite "/proc/self/task/"
+	addwrite "/dev/fuse"
+
 	local -x CMAKE_SKIP_TESTS=(
 		PyQgsAFSProvider$
 		PyQgsAnnotation$