gentoo auto-resync : 17:07:2022 - 14:31:38

4 files changed, 72 insertions, 15 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index b577e9c117b7..2d0dd021244a 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,5 +1,6 @@
+AUX falkon-22.04.3-python3.patch 1214 BLAKE2B 733d67908c009a17d63cf7b9e5012996bfbb9c005feb1ff3c94ccf20958479510cf1858479e7869124815b5a158821b434285b24b6babe95515da130c3f97e8f SHA512 bfd9514a167b24f3149173e34cb57ee5462311e70c8edd269d6cc7df9269c33a5a6da3ad3e312de878b1af7af994996bfa1cbd77d73de4e7242f851ee547a496
 DIST falkon-22.04.3.tar.xz 2492448 BLAKE2B c7b2bbe9a7b3a55078faa5d7706ebe5df279c3ffd618a064b7707a7636f1436779e7cbb89bda5e012e4d9982e8ffc29d01be8436f9d483fdd2c3f67a19f92cfc SHA512 174725086360f0109fb70bf7056c9cfa122a114aecf00bbe27a47c5f23cca76b69c41a2e15f077fd27cff726317f40be08e296ed249dbd73036a89502823d23b
 DIST falkon-3.2.0.tar.xz 2506692 BLAKE2B a94118e2bd8e97e00a5462d657ee07c06aed53f5bee21227f543f902588f68588c0f4e445bb5cae789d14dec25382802025f502138150db96fe636b20d257222 SHA512 1bc33a957dd265b3cdd944f85890500c7247d82752cc7d6847c61de2f810e75d10adddf81dc6bcb1e05e1cd3bda04767c66f1e16d7ed19634e3b80ad24ff6bc1
-EBUILD falkon-22.04.3.ebuild 2100 BLAKE2B f08476a3cb7291290eeb694602922892e75fa6da3c6f049df88c4ec5c1b9e7d4ce63bdb036809464d74dd92c16fe3bd031202b603c3e8c911be9edd897897cb3 SHA512 a569e9c6e953888eb45854cd2ac6146099b50d3b6dcb0689fce74bcde8f7114ae4574f9e7060b2a9424b5a0ebd5b49d95339c6a33cdded830052d6b643597887
-EBUILD falkon-3.2.0-r1.ebuild 1841 BLAKE2B dd37bad81f33ea432a15591f37d7ff7b8482085c507a738a71c99a8cea2fab0366b93573350dc47d028ef92e17f51a933cab3def7d942040ea64279b5a2b8c7a SHA512 37d5b1385c7105614c4331b649183723fd1f97822865c75e1a59eea3a06ab151264433f638135d31683254c9ddae73e325eeec09379a4896d860ed31cfdcd3be
+EBUILD falkon-22.04.3.ebuild 2372 BLAKE2B 2ffafba0fde5ba73601f9c356d991357c8f619ed25b206399eb68cc2677bed7eea1a1e71133e63ca641a5e6a4868969a5c3046cbf43b5e1ccd183d861b4a55a1 SHA512 70e72465a0b4280f9bbf57ab318b4ee591b0f1f9fc3f18d4a8d9acc9a0cdb8251d90d93efc9b4d5dc649c1e16564a0bdf361000caba2cbf77835f86f1bd4aa67
+EBUILD falkon-3.2.0-r1.ebuild 2449 BLAKE2B 1aa22874948ee808a76fddd81754223f80695b5d712878e03465e8ec340c762b68bd285739713b0987e8d8aa803a815fd544d6327e0a8906038c271657603e7d SHA512 d9e84e6dbb554553431a9f769754a49d219f9474dd6084dde0fc9fa577863e77ae12954d6dfc0efd0a9b2a9c7447a13718766e3ddaf4933a617edccd09f10e77
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/www-client/falkon/falkon-22.04.3.ebuild b/www-client/falkon/falkon-22.04.3.ebuild
index 52b53cad1525..9664f0e03464 100644
--- a/www-client/falkon/falkon-22.04.3.ebuild
+++ b/www-client/falkon/falkon-22.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="dbus kde python +X"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -64,12 +64,12 @@ fi
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtsvg-${QTMIN}:5
 "
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-python3.patch" )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 	ecm_pkg_setup
 }
 
@@ -84,5 +84,10 @@ src_configure() {
 		$(cmake_use_find_package python Python3)
 		-DNO_X11=$(usex !X)
 	)
+	use python && mycmakeargs+=(
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
 	ecm_src_configure
 }
diff --git a/www-client/falkon/falkon-3.2.0-r1.ebuild b/www-client/falkon/falkon-3.2.0-r1.ebuild
index f9dc201c1622..18b02edc8d3a 100644
--- a/www-client/falkon/falkon-3.2.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.2.0-r1.ebuild
@@ -6,8 +6,9 @@ EAPI=8
 ECM_TEST="true"
 KFMIN=5.88.0
 QTMIN=5.15.2
+PYTHON_COMPAT=( python3_{8..10} )
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Cross-platform web browser using QtWebEngine"
 HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
@@ -19,8 +20,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="dbus kde +X"
+IUSE="dbus kde python +X"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test" # bug 653046
 
 COMMON_DEPEND="
@@ -43,6 +45,13 @@ COMMON_DEPEND="
 		>=kde-frameworks/kwallet-${KFMIN}:5
 		>=kde-frameworks/purpose-${KFMIN}:5
 	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyside2[designer,gui,webengine,widgets,${PYTHON_USEDEP}]
+			dev-python/shiboken2[${PYTHON_USEDEP}]
+		')
+	)
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libxcb:=
@@ -58,20 +67,30 @@ fi
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtsvg-${QTMIN}:5
 "
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-python3.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_KEYRING=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_PySide2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
 		-DDISABLE_DBUS=$(usex !dbus)
+		$(cmake_use_find_package python PySide2)
+		$(cmake_use_find_package python Shiboken2)
+		$(cmake_use_find_package python Python3)
 		$(cmake_use_find_package kde KF5Wallet)
 		$(cmake_use_find_package kde KF5KIO)
 		-DNO_X11=$(usex !X)
 	)
+	use python && mycmakeargs+=(
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" # shiboken_helpers.cmake quirk
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
 	ecm_src_configure
 }
diff --git a/www-client/falkon/files/falkon-22.04.3-python3.patch b/www-client/falkon/files/falkon-22.04.3-python3.patch
new file mode 100644
index 000000000000..cd1025cbfda4
--- /dev/null
+++ b/www-client/falkon/files/falkon-22.04.3-python3.patch
@@ -0,0 +1,32 @@
+From 67199ef5f470dadab17401f3aad8770ec058c111 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 17 Jul 2022 12:45:25 +0200
+Subject: [PATCH] Python3 must be found first
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 950c03adc..aa91e745e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -130,12 +130,12 @@ if (KF5Wallet_FOUND AND KF5KIO_FOUND AND KF5Crash_FOUND AND KF5CoreAddons_FOUND
+ endif()
+ 
+ # Optional: PySide2
++find_package(Python3 COMPONENTS Development)
+ find_package(PySide2 "2.0.0")
+ find_package(Shiboken2 "2.0.0")
+-find_package(Python3 COMPONENTS Development)
++set_package_properties(Python3 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
+ set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
+ set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
+-set_package_properties(Python3 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
+ if (PySide2_FOUND AND Shiboken2_FOUND AND Python3_FOUND)
+     set(ENABLE_PYTHON_PLUGINS TRUE)
+ endif()
+-- 
+2.35.1
+