From d1d8adbfd346340c3784c72a9fa0868dde6ff736 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 27 Jul 2022 15:01:59 +0100 Subject: gentoo auto-resync : 27:07:2022 - 15:01:59 --- dev-libs/Manifest.gz | Bin 94965 -> 94982 bytes dev-libs/kopeninghours/Manifest | 1 - .../files/kopeninghours-21.03.90-boostpython.patch | 79 --------------------- dev-libs/modsecurity/Manifest | 2 +- dev-libs/modsecurity/modsecurity-3.0.7.ebuild | 2 +- dev-libs/qcoro5/Manifest | 2 +- dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild | 61 ++++++++++++++++ dev-libs/qcoro5/qcoro5-0.6.0.ebuild | 60 ---------------- 8 files changed, 64 insertions(+), 143 deletions(-) delete mode 100644 dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch create mode 100644 dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild delete mode 100644 dev-libs/qcoro5/qcoro5-0.6.0.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index b7a1d5de31ce..70c30146c9d1 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest index 808210dde50a..030e5a0cc31b 100644 --- a/dev-libs/kopeninghours/Manifest +++ b/dev-libs/kopeninghours/Manifest @@ -1,4 +1,3 @@ -AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68 AUX kopeninghours-22.04.0-boostpython.patch 3555 BLAKE2B 1d22b48e5574ffada0b89a0828bf5258321b57161061534939e95256ab3501a887a026231568e09b1d20499238284107c34c6835d33853096be62e1345356cde SHA512 562b30fe66a9e8904e79c95496c4b06e50dbbb8d328db93a655ffa7f8829ff70bc8a6b0ee7beb7840e7046b74d4d858265ec67703c6317c3fe4c87b54b40a349 DIST kopeninghours-22.04.3.tar.xz 69160 BLAKE2B 8875d1ee869c6cae8730e83ff8144e45a6ab24aff02ec85084022ab30f9274a2f7c5bd4e0bf88f27c3626ee580a6fac9e2446fa711823011b305ba9bdf1d88c9 SHA512 68e49cd35db2f381cfd88787ed2085e69c6485de87c2cd5783675784cb169d274115d9bc36cde6ed447d6cff6922278330ac1aa819a0d996f2a5b861f6f1bf7e EBUILD kopeninghours-22.04.3.ebuild 1288 BLAKE2B 72ee5f449e7ddb969db1e375f8a34d487d85a699f9b9b1b3a2759a55e23a61ffff9b55d5b02b553424149a9746b705251358d2b82b1707754662e526fa8f37a4 SHA512 374c688eb4fad7b222b272d003ad390c7d07d0ec23d61ef1dc73838cb63fe38f61dfd65b9101f0b63a6c347b2180c3cd0265288e9f52106a21ea9785d43a58c9 diff --git a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch b/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch deleted file mode 100644 index 939bcbcd9e37..000000000000 --- a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch +++ /dev/null @@ -1,79 +0,0 @@ -From fd7c2e1f3797c1a67dc6346dfcb192f042cb19e8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 11 Apr 2021 14:33:48 +0200 -Subject: [PATCH] Use FindPython3 w/ Python3_SITELIB, add - BOOSTPYTHON_VERSION_MAJOR_MINOR - -- Use BOOSTPYTHON_VERSION_MAJOR_MINOR to inject desired python target -- Drop deprecated PythonLibs -- Use FindPython3 with Python3_SITELIB for correct install location - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 16 +++++----------- - PyKOpeningHours/CMakeLists.txt | 10 ++++------ - 2 files changed, 9 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c50b40..a9a9328 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-FileCopyrightText: 2020 Volker Krause - # SPDX-License-Identifier: BSD-3-Clause - --cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.12) - - # KDE Application Version, managed by release script - set (RELEASE_SERVICE_VERSION_MAJOR "21") -@@ -56,22 +56,16 @@ set_package_properties(FLEX PROPERTIES PURPOSE "Lexer generator for parsing open - find_package(BISON REQUIRED) - set_package_properties(BISON PROPERTIES PURPOSE "Grammar generator for parsing opening hours expressions") - --find_package(PythonLibs 3.6 MODULE) --if (PythonLibs_FOUND) -- # Extract major/minor python version -- string(REPLACE "." ";" VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) -- list(GET VERSION_LIST 0 PYTHONLIBS_VERSION_MAJOR) -- list(GET VERSION_LIST 1 PYTHONLIBS_VERSION_MINOR) -- -- # boost-python requires exact version number -- find_package(Boost COMPONENTS python${PYTHONLIBS_VERSION_MAJOR}${PYTHONLIBS_VERSION_MINOR} MODULE) --endif() -+set(BOOSTPYTHON_VERSION_MAJOR_MINOR python36 CACHE STRING "Version of BoostPython to feed CMake's FindBoost") -+# boost-python requires exact version number -+find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR} MODULE) - - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) - add_definitions(-DQT_NO_FOREACH) - add_subdirectory(src) - if (Boost_FOUND) -+ find_package(Python3 3.6 COMPONENTS Development) - add_subdirectory(PyKOpeningHours) - endif() - -diff --git a/PyKOpeningHours/CMakeLists.txt b/PyKOpeningHours/CMakeLists.txt -index 771cedf..e755ea7 100644 ---- a/PyKOpeningHours/CMakeLists.txt -+++ b/PyKOpeningHours/CMakeLists.txt -@@ -21,11 +21,9 @@ kde_target_enable_exceptions(PyKOpeningHours PRIVATE) - target_compile_definitions(PyKOpeningHours PRIVATE KOPENINGHOURS_VALIDATOR_ONLY) - - # Set up the libraries and header search paths for this target --target_link_libraries(PyKOpeningHours PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} KOpeningHours) --target_include_directories(PyKOpeningHours PRIVATE ${PYTHON_INCLUDE_DIRS}) -+target_link_libraries(PyKOpeningHours PUBLIC Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${Python3_LIBRARIES} KOpeningHours) -+target_include_directories(PyKOpeningHours PRIVATE ${Python3_INCLUDE_DIRS}) - --set(_install_dir lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/site-packages) -- --install(TARGETS PyKOpeningHours DESTINATION ${_install_dir}/PyKOpeningHours) --install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${_install_dir}/PyKOpeningHours) -+install(TARGETS PyKOpeningHours DESTINATION ${Python3_SITELIB}/PyKOpeningHours) -+install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${Python3_SITELIB}/PyKOpeningHours) - --- -2.31.1 - diff --git a/dev-libs/modsecurity/Manifest b/dev-libs/modsecurity/Manifest index 5768cd3799ab..17ee6a300e49 100644 --- a/dev-libs/modsecurity/Manifest +++ b/dev-libs/modsecurity/Manifest @@ -1,3 +1,3 @@ DIST modsecurity-v3.0.7.tar.gz 3333372 BLAKE2B f391e2057b95a26a16efaa5f9d86acdd030b2f32d3da3ebac4e5eccdae7c9c6453bdb6b4e2d7f49ce189760d5c5de7d656aa5796fe2723e2e6f5493c93420913 SHA512 d8caf5946b598b16c4481938f22c1116595286811cfdb01d95db95ab061f7045751f2aa98e515df239bceb3f1a6dce2ecd5b24c954bddc27997fa64e9e429730 -EBUILD modsecurity-3.0.7.ebuild 1937 BLAKE2B 27dbec0cb4a09f395c350dac4d21e9668ddb2b69cc9775b5abce82c7cb236f377cd359409d589db720611ffe0415667af6e58e6d5f428c2e857004ab9fbed970 SHA512 8b6dd8cab9020738413844b5e8cdd9b978ded3eb4a3ae66254e83489966172f0a54764bc37729a11758c97d2e780db154f07c84dde03d000f61f2d0bf3160b74 +EBUILD modsecurity-3.0.7.ebuild 1944 BLAKE2B 398365375f9bfdbab1896b3a9c354cc6d9dbf51768a72d3d05a3d5735e8dd13d57686b88388158eaa1b59f13efc5db7aed8facd3201c81c301e90e95bbfb049d SHA512 6bb8999056c5ab3f2057d167efc55faf58b735ea7ddc90e790755f79879949c3981b729081f0ed3da2df04feb7f8f8a4ae6ce9d1a1191bc02aa182a59f28baee MISC metadata.xml 1019 BLAKE2B 0873fbb1c328dea3378abbe280dc7adacf389a9f1085614057e328ca7258afb4553c2a37bb527eb80b995d69e428ac7fcb3306e65a84c0e3d17acb6ace270b0b SHA512 549b1dc80684fff950148598807b866ab9400c619d2ecb32f2e7f90f8f298dd47daadd4c33f76af40983ed22ffbbb017c110253d810bab931344dd6f80d8f2ce diff --git a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild index 5eed83999703..6a604332810b 100644 --- a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild +++ b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="doc fuzzyhash geoip geoip2 json lmdb lua pcre2" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" diff --git a/dev-libs/qcoro5/Manifest b/dev-libs/qcoro5/Manifest index dbb6465d9793..1ae6954d1aec 100644 --- a/dev-libs/qcoro5/Manifest +++ b/dev-libs/qcoro5/Manifest @@ -1,3 +1,3 @@ DIST qcoro5-0.6.0.tar.gz 122618 BLAKE2B 1fbd97d8b9897e9dc7408b2bf667064a3ec6326778c44472689e180af9eedc524236c5104b11a117fa8650f042a4ee3bd2b165e44385a829e8638c5e98d293a8 SHA512 e2e0219156a5ba693c935323c45c7414ce0f8d1773986ca63682812678e2b35146c76fa033ef791facfb57fa67fb96727df75ce6ecdae1e232be42f376973a8d -EBUILD qcoro5-0.6.0.ebuild 1207 BLAKE2B 749f94cbd38ba988957197862ecb48fc24b3832ee9b4c254e2ba53c4b7356c05d025b9ba8b1b45d12babaa363fa0af7a75edc8243f74f38465d31de1afff75f9 SHA512 8b6e8520eff40214c022bac75c2057d87de2fc47014593bc9023f041eb9b9f9b514811359c46417b0a6ca7ca44431d9d266926acab1a9774a7f60e6f774282c4 +EBUILD qcoro5-0.6.0-r1.ebuild 1246 BLAKE2B 717e37c90bbb931055102aed1303c3e85abe486e37f339e86cde122bd9bffc9d7ff0937c9a3d2834cd1c2f14afc0cbb827e5b4e7062f9aadac8dfc4b10ec14d1 SHA512 dc7fc6103bcca8ff961940d12ba275bdbb98e4b458f5d7b17b7c93c2403a1d327be48d2cbb91c2d8519b16709416622a6af750746b20d2106041c5cebeaaa54e MISC metadata.xml 483 BLAKE2B cd6ca8acffb789b49e66d28dae68abadbd50ccb08bd229840481f18b4dcdda586b52ac975a1b826b85672ee4a6759d8cbd285c9c7ed91a1b60e341f441ad0455 SHA512 2bed7eca8178dfd4c6b7c30417ddfde30250926aacb7718e1f81c35a29fff079ea2dbd4c2f3270a339ee5d3fb59ddde875dfb0dc41be9149cf31e88e0f00c249 diff --git a/dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild b/dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild new file mode 100644 index 000000000000..3dfb9565e27a --- /dev/null +++ b/dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/danvratil/${PN/5/}" +else + SRC_URI="https://github.com/danvratil/${PN/5/}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P/5/}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="C++ Coroutine Library for Qt5" +HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro" + +LICENSE="MIT" +SLOT="0" +IUSE="dbus examples +network test websockets" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5 + dbus? ( dev-qt/qtdbus:5 ) + network? ( dev-qt/qtnetwork:5 ) + websockets? ( dev-qt/qtwebsockets:5 ) +" +DEPEND="${RDEPEND} + examples? ( + dev-qt/qtconcurrent:5 + dev-qt/qtwidgets:5 + ) + test? ( + dev-qt/qtconcurrent:5 + dev-qt/qttest:5 + ) +" + +src_configure() { + local mycmakeargs=( + -DUSE_QT_VERSION=5 + -DQCORO_BUILD_EXAMPLES=$(usex examples) + -DQCORO_WITH_QTDBUS=$(usex dbus) + -DQCORO_WITH_QTNETWORK=$(usex network) + -DBUILD_TESTING=$(usex test) + -DQCORO_WITH_QTWEBSOCKETS=$(usex websockets) + ) + cmake_src_configure +} + +src_install() { + if use examples; then + docinto examples + dodoc -r examples/* + fi + cmake_src_install +} diff --git a/dev-libs/qcoro5/qcoro5-0.6.0.ebuild b/dev-libs/qcoro5/qcoro5-0.6.0.ebuild deleted file mode 100644 index 4efdf36d5d58..000000000000 --- a/dev-libs/qcoro5/qcoro5-0.6.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/danvratil/${PN/5/}" -else - SRC_URI="https://github.com/danvratil/${PN/5/}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/5/}" - KEYWORDS="~amd64" -fi - -DESCRIPTION="C++ Coroutine Library for Qt5" -HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro" - -LICENSE="MIT" -SLOT="0" -IUSE="dbus examples +network test websockets" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dbus? ( dev-qt/qtdbus:5 ) - network? ( dev-qt/qtnetwork:5 ) -" -DEPEND="${RDEPEND} - examples? ( - dev-qt/qtconcurrent:5 - dev-qt/qtwidgets:5 - ) - test? ( - dev-qt/qtconcurrent:5 - dev-qt/qttest:5 - ) -" - -src_configure() { - local mycmakeargs=( - -DUSE_QT_VERSION=5 - -DQCORO_BUILD_EXAMPLES=$(usex examples) - -DQCORO_WITH_QTDBUS=$(usex dbus) - -DQCORO_WITH_QTNETWORK=$(usex network) - -DBUILD_TESTING=$(usex test) - -DQCORO_WITH_QTWEBSOCKETS=$(usex websockets) - ) - cmake_src_configure -} - -src_install() { - if use examples; then - docinto examples - dodoc -r examples/* - fi - cmake_src_install -} -- cgit v1.2.3