gentoo auto-resync : 02:09:2024 - 12:28:17

4 files changed, 2 insertions, 127 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index c8bc4e29a1c7..ee8042793a21 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,8 +1,5 @@
-AUX falkon-23.07.80-python3.patch 1264 BLAKE2B d668b68b5282fad9670e0a20a140f621aade354e94a7b57f4093c37a163a7d6d90b8da6b911411a1a14973486f227de6efad3ebb49ca37fa9000ce47071976ef SHA512 33f4157e3f608ea01e95c0b6e46b958287abd943c3da94b7b599af2ef37a6683ff11f44325faf784d9927c6e71857cd086154a2e3e6f9cd90d6030587e0169a7
-DIST falkon-23.08.5.tar.xz 2574364 BLAKE2B 9090263ee1e9a76cf9efebf6f3c8b5d0ca25a907f467ebe5adff6d54e71c79aa982317094ea354fb4fa898244b119b73640fc92ae301f95fe78551d3e84921a9 SHA512 215e2a4ff551aa6d3fab0317d2b2b823b7fee4c1f6a653118d00f3def9ebb037931e8cd81f33785a44c8aa8910e00fbda884c1cfcdb61190544d1e6c8396acf8
 DIST falkon-24.05.2.tar.xz 2584984 BLAKE2B 5743e689281cd38e07f352499a8ef96ffe3300f702721dbd3493753b1346af6a4a837b0034366136b7b1bfb4566a62ae9b9050c1e67733d3b6d1b3713d915c63 SHA512 b3d6b2f13431871d1f6202eeeafac9b821c5b9d140eb635b9c4bcfb3f2cc785d0fcabfcd983f25cfcdc76fd20d9f90bf46ed766db42228eaad34ad524a228a3b
 DIST falkon-24.08.0.tar.xz 2635528 BLAKE2B 994ebe555c41f7b6552c0ea4cf921840dc791d50f1d6cd6cefb79fac74fb747e4de57830e412d29c3138bfbd9b41bdaeda10a62838d2dbd5a306d029f50cd953 SHA512 b136a8e4a8c63da2d7cf45a1be3cf00df48f19ee31845c25d5464aa5e7ec51315268304707e7a147f8ca899100d497b5ba42d4586383175e96401af26df440df
-EBUILD falkon-23.08.5.ebuild 2302 BLAKE2B 4e88b797351a31b7459de1282d02ef2a7692c5ca6ff2f5b9c0799f46b42769f9c5e55f6da505e2a32aa3ad0aee6e14de10a99ad9ab4ee84ff77f0e4ea9cdbff5 SHA512 e59861927e10360bd4b9febb5b79c085f729df2975575c27f3fde94ddefebfb260a393a594e5d046d8dd13dba28c17f11f55a55f431b80427ea8939655b2cc2d
-EBUILD falkon-24.05.2-r1.ebuild 2124 BLAKE2B c527b2edc4ddbba4505de6d06fe128c8a683f9f4c443cc8b6b4eda62d5879f3017c5931c8104e9986d79b995beea743dcdab19a8e782655db354d10a9f9060bb SHA512 325c7bd99d137c43fc8dddd6868d2ee9c8c976f56e568564ec581d38ef908c099c6d6e7932f13080011e3e7f56afb167c176a219d277c4594469b2d56aaa896f
+EBUILD falkon-24.05.2-r1.ebuild 2123 BLAKE2B a8b720e0a467a7cfcaf6fbf3abb3f7ed80099e815ec1efd2363c22946813e74fda1b6bf9c5462f31ad7ab585305a7adffd22286ded59f2ac6c3e431ef3a21a4b SHA512 1840e4f4d866ea9fd62de8fecd45f313bd8ab7e3f7873b31d2696c7aed38d3d10704a23da4f5ba1b01022eeb003bc09ac0a71e71020fd50b7160c0f4efc587e6
 EBUILD falkon-24.08.0-r1.ebuild 2125 BLAKE2B 96072b1801682db01954b601871a34ab722afba77ce48c882d95fb1b06cbc8c61e82aab4ace36f46ae4b4c0c6d99dca99394967e5ec82653c1d74103e60e19e3 SHA512 32a6f57fece9fbb5b95bba86ec617336a47e0c8461e10e0f06cbb1a7600a713c4b979408b59738c27ec7b959c41568adbb14fb87e7e89638f5dcb187f36a9118
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/www-client/falkon/falkon-23.08.5.ebuild b/www-client/falkon/falkon-23.08.5.ebuild
deleted file mode 100644
index 2bbf4951827f..000000000000
--- a/www-client/falkon/falkon-23.08.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-PYTHON_COMPAT=( python3_{10..11} )
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="dbus kde python +X"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test" # bug 653046
-
-COMMON_DEPEND="
-	dev-libs/openssl:0=
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwebchannel-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5=[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	virtual/libintl
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	kde? (
-		>=kde-frameworks/kcoreaddons-${KFMIN}:5
-		>=kde-frameworks/kcrash-${KFMIN}:5
-		>=kde-frameworks/kio-${KFMIN}:5
-		>=kde-frameworks/kjobwidgets-${KFMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-		>=kde-frameworks/purpose-${KFMIN}:5
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep "
-			>=dev-python/pyside2-${QTMIN}[designer,gui,webengine,widgets,\${PYTHON_USEDEP}] \
-			>=dev-python/shiboken2-${QTMIN}[\${PYTHON_USEDEP}]
-		")
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" >=kde-frameworks/ki18n-${KFMIN}:5"
-fi
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-PATCHES=( "${FILESDIR}/${PN}-23.07.80-python3.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KEYRING=OFF
-		-DDISABLE_DBUS=$(usex !dbus)
-		$(cmake_use_find_package kde KF5Wallet)
-		$(cmake_use_find_package kde KF5KIO)
-		-DBUILD_PYTHON_SUPPORT=$(usex python)
-		-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-24.05.2-r1.ebuild b/www-client/falkon/falkon-24.05.2-r1.ebuild
index d0cf7cd5a3af..63d6208485b8 100644
--- a/www-client/falkon/falkon-24.05.2-r1.ebuild
+++ b/www-client/falkon/falkon-24.05.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.falkon.org/ https://apps.kde.org/falkon/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="dbus kde python +X"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/www-client/falkon/files/falkon-23.07.80-python3.patch b/www-client/falkon/files/falkon-23.07.80-python3.patch
deleted file mode 100644
index d0b0e4bad788..000000000000
--- a/www-client/falkon/files/falkon-23.07.80-python3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9415a9da443c9a566dd2220551928c16602fa284 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 a847838be..1b5b38bbc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,12 +134,12 @@ endif()
- # Optional: PySide2
- option(BUILD_PYTHON_SUPPORT "Support for Python plugins" ON)
- if (BUILD_PYTHON_SUPPORT)
-+    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.41.0
-