From 05644e4ce4886d97a712fcdca7d4144a7ced4191 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Dec 2023 23:32:21 +0000 Subject: gentoo auto-resync : 12:12:2023 - 23:32:21 --- dev-qt/qtdeclarative/Manifest | 7 ++-- dev-qt/qtdeclarative/metadata.xml | 1 + dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild | 33 ------------------ dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild | 39 ++++++++++++++++++++++ dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 14 +++++--- 5 files changed, 53 insertions(+), 41 deletions(-) delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild create mode 100644 dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild (limited to 'dev-qt/qtdeclarative') diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 46081795413a..0983ccd3fe59 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -3,13 +3,12 @@ DIST qtdeclarative-5.15.11-gentoo-kde-2.tar.xz 31064 BLAKE2B 7e4390fc71b52cc12dc DIST qtdeclarative-5.15.11-gentoo-kde-3.tar.xz 31612 BLAKE2B 0a7a5310e5a0941b5a0cc73395fbe6bdf487bf75f98c5d0c0bbb7ea0d02c297f34a52c9ac0fad53404188077c531c2bb1096d99807e5810c07cc5900229ecfa4 SHA512 0957ad057ba3c3de4e2b5f15af2bc51e2c8333e1c23e48aa0ea213e5f1d7caaeb5bdc83f1c1c60c05563c2e6db7d0bce378b337c7a0b14ff9f5e30459e38b92c DIST qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz 21601640 BLAKE2B 5bb4d6484c54593b3c65f00c070c52e384cd7ff7be115abf54d4b3883e78d42994a4dee502c073ae4738020ada0d375ae1a1b8bb346e13ee28e287c69daeefc5 SHA512 08f76c5a1253d6014e48ef8d8c53f65d3087efea0f614f36aa03f37882c6947109b17398ac491157c4fbd0c954762e819c2f074fa5a71e6990f16a54ec7224ae DIST qtdeclarative-everywhere-src-6.5.3.tar.xz 34140352 BLAKE2B 36b2f8de9138a60e72d3116b905d266374f9f047ce0ebf6d24b967faa4de11243dc34aa86057ca2e6ee1f4da104b947000fb8473025ff2ea3757b0ee0a9b3907 SHA512 d3fc2f01de9940cf8715cf525bc0c68555c5dc519b4a78952682c23bfc9c09249fb651c6e4dddac128b7e96f07e0371d3040b8f8c5480c8c3fccc4f3bfec2640 -DIST qtdeclarative-everywhere-src-6.6.0.tar.xz 34331124 BLAKE2B 3367619a1a9decc09340c8332e8f4f2a619254517030a64407a7ce1334e0f57df472e53f167adcbbc979458ee060607d16a77bd40eace4f30d8b30ff35dc7e69 SHA512 6563d23d48c828a7895279c42befa2275b02301fa16906494ea84a9c80076ea5c7f1be773a52f483dab5d8304feedfd9c5df4ac83cd77284aacae0287760555a DIST qtdeclarative-everywhere-src-6.6.1.tar.xz 34349560 BLAKE2B 399d11d52cbafdb13a21a39a9d98b314d45f39ec5351265f9e6fd08a335c48907cdcd1fde23da079ade6cf9adeafd48ba5cba2233cd54d2f6f51ae05a4979780 SHA512 1a819187519670338df1c308d5980aed985670ee3e79a424e56d8e300855513541f46a1b89d9f595bdab382a0072761f0fda87d78653602041a10a5bd3e7bdcd EBUILD qtdeclarative-5.15.11-r1.ebuild 1537 BLAKE2B 0af4262a6a66031b32a4e1f5de32e94f56e1efb6cd19dadbc4c1cc8a933c34f7b31eecb701e7c431fcb70bc8ecd00d1afcbfd764ae44e1abe7ecd68d7a01d99b SHA512 27da0c6ba1d551bc3fad24891e090f61e56d69c4096ea7c0c39bf22ddeef7e414a211c7c27ec570997f51e001fdcf89165314ea5bd9bfaeff4c62fabc72be1b9 EBUILD qtdeclarative-5.15.11-r2.ebuild 1539 BLAKE2B 2f694176df11201341bdaf9daedd80e564487f4d5199de9fd7bec1010a681ab33f1e41ae12afc34c8921d0ddbf071145d97c59ebde8c841ddda7ccbb42d21b35 SHA512 904ea1f1aca55a9bf6021bd5bf9e03ef013a78a2b6a8363ba1cfa1e7f539c8a5974f22a33a8cbfee822986ab69154e6887fbc2924fdfb3c7479be26dc2bf0655 EBUILD qtdeclarative-6.5.3.ebuild 770 BLAKE2B a1566f08b9120c10636c76b1a211498b1625d512171c58747b006529950641f68f55f62f34c42d03e2f57a555e5ed404db23461dd7758bd01f0d3a3d527ea94d SHA512 7db4adca1e2982a4c65418dad0adc27554898b814695fd326c9bb594f08eafe8917946e2f5dc21494abfb4eb09289a636a61df5843711a76ead7153ef9fff4e7 -EBUILD qtdeclarative-6.6.0.ebuild 743 BLAKE2B fdc766f843759004d095d12564b736057bf7c2325e6e43dfe6eb21dcd185c0b3a67850496b575ba057e2135d97b4ca8ed04a94b9076e87605d52dc9231f21e17 SHA512 6de77ce9915baa4f25edabbf2601663e54b2e12f407123d163faeaf7c5dd088f74997aaad58482264375d383e1c43d7f43576e297f9857c684c1a6c1df59370b EBUILD qtdeclarative-6.6.1.ebuild 769 BLAKE2B 26581237a6df9cc548e18e21ef734406e823ca1373023e4469dc68695cdea81155e89e4d3311fa51e6ef6cb3116f5f535b18fa20ef140e05cf6a6da0766e18bf SHA512 86a13e7ce83139d22b6b49def4dd69fa33cb97e1bd748cd596aadc80f5782632ed0c72bb574ddb5d9f46c95cfc5ccac94c57e3172158c3316b68f613f83e105b EBUILD qtdeclarative-6.6.9999.ebuild 743 BLAKE2B fdc766f843759004d095d12564b736057bf7c2325e6e43dfe6eb21dcd185c0b3a67850496b575ba057e2135d97b4ca8ed04a94b9076e87605d52dc9231f21e17 SHA512 6de77ce9915baa4f25edabbf2601663e54b2e12f407123d163faeaf7c5dd088f74997aaad58482264375d383e1c43d7f43576e297f9857c684c1a6c1df59370b -EBUILD qtdeclarative-6.9999.ebuild 743 BLAKE2B fdc766f843759004d095d12564b736057bf7c2325e6e43dfe6eb21dcd185c0b3a67850496b575ba057e2135d97b4ca8ed04a94b9076e87605d52dc9231f21e17 SHA512 6de77ce9915baa4f25edabbf2601663e54b2e12f407123d163faeaf7c5dd088f74997aaad58482264375d383e1c43d7f43576e297f9857c684c1a6c1df59370b -MISC metadata.xml 800 BLAKE2B ac64df7acf6a3fff34fe396b981c4babb145590b2e8d8d656ea6287d2a251c799866748f184a4b1876fe3195120a6192fe9ea7d787f49978a3c8d47159c01031 SHA512 30e9c9c8c3719791e927574a08a0a5667c327ca3d6c614df1b372ae1390074ae5ba16d0363cc81c625fa9ce585f93cb4bcba78ad9f0b36470d63c614c195c5c2 +EBUILD qtdeclarative-6.7.9999.ebuild 895 BLAKE2B f1ba4891655b527383672663345c6128b8757998f0488aed02111f869365ee33dbb99ec315b848ceaa8d958963e2250a26b5080b489bfb290e43fc6376ef1cb6 SHA512 64324a0d2ef39d62daf3615a35b7bb14bfbcc4817ac708628fcc26d3755ee4e4dbd87e88e70f3093492f055d3fb42773d772df97726533087a7ea33d15f278fb +EBUILD qtdeclarative-6.9999.ebuild 895 BLAKE2B f1ba4891655b527383672663345c6128b8757998f0488aed02111f869365ee33dbb99ec315b848ceaa8d958963e2250a26b5080b489bfb290e43fc6376ef1cb6 SHA512 64324a0d2ef39d62daf3615a35b7bb14bfbcc4817ac708628fcc26d3755ee4e4dbd87e88e70f3093492f055d3fb42773d772df97726533087a7ea33d15f278fb +MISC metadata.xml 855 BLAKE2B 6be7ee8e497916e78de02244cba14f33434b37f34f901a3a789bc684ea509da865042b10ae37f12491281f846adbb0daadeb90205026d5fdd76d07755cd168c8 SHA512 0abf60e4c4624c698081871cadf757698ad4eded995c7c83f0edf739af2fa3be5f9a79f716403e40f2f8e09dfeeb5dd20342ec498fa121eb4cf9733462c8055a diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 62a0a2de1bd8..2d0b3fc41d29 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -7,6 +7,7 @@ Build the LocalStorage import for QtQuick (requires QtSql) + Enable QtNetwork support Enable OpenGL support Enable QtSQL support Enable QtWidgets support diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild deleted file mode 100644 index 2b2d23cdc5a7..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86" -fi - -IUSE="opengl +sql vulkan +widgets" - -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -RESTRICT="test" - -RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="~dev-qt/qtshadertools-${PV}:6" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package sql Qt6Sql) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild new file mode 100644 index 000000000000..ca39dcd8b2f0 --- /dev/null +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-any-r1 qt6-build + +DESCRIPTION="Qt Declarative (Quick 2)" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86" +fi + +IUSE="+network opengl +sql +ssl vulkan +widgets" + +# behaves very badly when qtdeclarative is not already installed, also +# other more minor issues (installs junk, sandbox/offscreen issues) +RESTRICT="test" + +RDEPEND="~dev-qt/qtbase-${PV}:6[network=,opengl=,sql?,ssl?,vulkan=,widgets=]" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND=" + ${PYTHON_DEPS} + ~dev-qt/qtshadertools-${PV}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package sql Qt6Sql) + $(qt_feature network qml_network) + $(qt_feature ssl qml_ssl) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 2b2d23cdc5a7..ca39dcd8b2f0 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit qt6-build +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-any-r1 qt6-build DESCRIPTION="Qt Declarative (Quick 2)" @@ -11,22 +12,27 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~x86" fi -IUSE="opengl +sql vulkan +widgets" +IUSE="+network opengl +sql +ssl vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) RESTRICT="test" -RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" +RDEPEND="~dev-qt/qtbase-${PV}:6[network=,opengl=,sql?,ssl?,vulkan=,widgets=]" DEPEND=" ${RDEPEND} vulkan? ( dev-util/vulkan-headers ) " -BDEPEND="~dev-qt/qtshadertools-${PV}:6" +BDEPEND=" + ${PYTHON_DEPS} + ~dev-qt/qtshadertools-${PV}:6 +" src_configure() { local mycmakeargs=( $(cmake_use_find_package sql Qt6Sql) + $(qt_feature network qml_network) + $(qt_feature ssl qml_ssl) ) qt6-build_src_configure -- cgit v1.2.3