gentoo resync : 09.07.2022

4 files changed, 3 insertions, 138 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 30d439065035..71fdd591d506 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,10 +1,5 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-DIST qtdeclarative-5.15.4-gentoo-kde-1.tar.xz 17224 BLAKE2B 296db0b36c0fc560eb262133289fd845b5f7ebfc52efe71f9d8b08ddf8b3f470e599fa8876fb3efa60664526103d5c4b38a418b381f571895e433bc2f91676a7 SHA512 f99928400628e0d74f89cd68f315eee7e5bc886e9949c5a910887d60a288b77375a64de5d40e601f0fc304f67aa32f5336caef0e0597564919e6b945df2bddab
-DIST qtdeclarative-5.15.4-gentoo-kde-2.tar.xz 22504 BLAKE2B 2e04de1a4f69e3ac89a2f420b374fa65ee6741a5df966a4cc7de40d9ff4b134231568b1c39c1bb1f1cfa0fad1b09967de816b88b84c1d8a7a8a58d1824c632bd SHA512 183b11738202917c1270af69dbcf9e417b4c9033c8b3555cddf3515eb1d3f0440ed4735766423115c7642a47e9109081a62cdf3834c221b4b9c61b589c6180fd
 DIST qtdeclarative-5.15.5-gentoo-kde-1.tar.xz 21772 BLAKE2B 83a19f79355102da7c3bb705a85fd6d9cfe7b0906a60664c56ca43e47ede33dffc0655ea71c79aeb60048e8c7810ae4279a6a0f491ff8a687743fe715a7ee033 SHA512 6a8e979f3673373bfae29d30b909f8d4034e64206ef5b09e34e2168421ad8c0d58972d1fe446ee61d8dcb2e27dafce455885749d8f4df45abdaeb5ed66358a3c
-DIST qtdeclarative-everywhere-opensource-src-5.15.4.tar.xz 21573148 BLAKE2B 092d323c89de0f8be786cfd9dcc3bf84f51c54f3e984b3c0fac1d110a92c94f67f8ba7da43e96dbf5afe1cfb7de49f204a684ea9b189be7f412d1f61a838b121 SHA512 8a4ff61238fde7cc563f9d94b5d1f4fd71ecb95ace447e57d08f71da82400b37c42f4f1ecdcd561116bffa1ed483219e06fb550f91c90842e5a43487bc4706b6
 DIST qtdeclarative-everywhere-opensource-src-5.15.5.tar.xz 21581628 BLAKE2B 4cd378a0e55269c9b22349c161f81653e43326e2e78ed7880f776aa787a934412bc83196fefdbc09250db283aff883668eb29fab326bdee4a5a966e57028b538 SHA512 b4b2754ae3566bbfa3e0162738ae6ea3b36d506841ce7e4b5651d0b0ca1c341ab19f653aebc23d13a17840d391280137c463c29fcf4866fc1f1c3adf8ebb5e5b
-EBUILD qtdeclarative-5.15.4-r1.ebuild 1497 BLAKE2B 25aa8b4bc3d8d518b30254f4490fe25953c1b26c5340ed42bed9935dd00ab673a3173743a52538a1a976fc5922cca74f3bc9889459dba976b16084d80c644eda SHA512 476eecfaefdb6eb16c55ebd769a2f1381a4c2f829116be2f4dd3787ff759846d32d559fe7f58927fe43ef2c4694e18f26e558bca323f6445b16c59f47cfacb88
-EBUILD qtdeclarative-5.15.4.ebuild 1495 BLAKE2B 4ba4f552bace5306e251bf88ea352bce81eeaf2050b82b2a83ee8df8bea63ba19507cf387a149aeead584ae2714841d45ea9207b5791c5614b7a1275ff6152ac SHA512 24d71b5eb261bf884a2ea8aa582ceca3dbf1f07a087b2c120e4ce671e9a2f784608618f4800b46c61cab052d7346c538dc9fc15e64b682954a54ea46f40d2456
-EBUILD qtdeclarative-5.15.5.ebuild 1555 BLAKE2B 22b787a12268727102b14b91a8594bc499c8f705971b201fae06ada9b7c8c6a19dda73c4ddcd4ce0e3a1473ad02d95168cc899b1b4364f713eedfd1eac57f2c2 SHA512 ed40f6c916d90df0044b0aada1be69bc61fc3232679b4386f69e7ac8574e38aec650f9ba996c45962e17a0a1eb957af7e361586abfd552043fc5e6628f0bd73f
+EBUILD qtdeclarative-5.15.5.ebuild 1549 BLAKE2B 27a4c3fd9059ca5964351063adbd6804461652ee824be3c9219c4f4212df0c96ec05f24479628b650c7255743421f713c6791df303df180da875c53fcd30a92e SHA512 3a44bb5546fc9674ad55bc80f422ad2a30393960996610cf6004ac217efbd732f74a4c7f3344f6d40730428f9c7aea235a28939d714e74db744442186240cb27
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild
deleted file mode 100644
index 33832b597da0..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-)
-
-src_prepare() {
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
deleted file mode 100644
index cc8049ce2c72..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-)
-
-src_prepare() {
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild
index 06fc4e064066..496d3d0790c3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 QT5_KDEPATCHSET_REV=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit flag-o-matic python-any-r1 qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"