From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-libs/kopeninghours/Manifest | 5 +- .../files/kopeninghours-22.04.0-boostpython.patch | 79 ++++++++++++++++++++++ .../kopeninghours/kopeninghours-21.08.3.ebuild | 64 ------------------ .../kopeninghours/kopeninghours-22.04.0.ebuild | 65 ++++++++++++++++++ 4 files changed, 147 insertions(+), 66 deletions(-) create mode 100644 dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch delete mode 100644 dev-libs/kopeninghours/kopeninghours-21.08.3.ebuild create mode 100644 dev-libs/kopeninghours/kopeninghours-22.04.0.ebuild (limited to 'dev-libs/kopeninghours') diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest index 5d9113d2d41e..31650649cb04 100644 --- a/dev-libs/kopeninghours/Manifest +++ b/dev-libs/kopeninghours/Manifest @@ -1,6 +1,7 @@ AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68 -DIST kopeninghours-21.08.3.tar.xz 65904 BLAKE2B 88169a5881a49fbb6728d706585d2e2d4c88d2eb66360917c1d0cef0cb7239de378d69afc1970f038e9c52756fe6097d5e423577a29e77c071e0b5ad54b7c6c2 SHA512 9fe8181b4c4e9427a6eba133a51b119e86378933ebf5bdbfe5a78c711837ccdbaa8baa04cb10e234febe7596c7e7e515dda8e09f8568bd785b0a3e061f6d8bcf +AUX kopeninghours-22.04.0-boostpython.patch 3555 BLAKE2B 1d22b48e5574ffada0b89a0828bf5258321b57161061534939e95256ab3501a887a026231568e09b1d20499238284107c34c6835d33853096be62e1345356cde SHA512 562b30fe66a9e8904e79c95496c4b06e50dbbb8d328db93a655ffa7f8829ff70bc8a6b0ee7beb7840e7046b74d4d858265ec67703c6317c3fe4c87b54b40a349 DIST kopeninghours-21.12.3.tar.xz 68916 BLAKE2B d80275c195231ca52e0042149d685224c9ffadd6d341ddce1af6f46df451442e924f282119c91ab004dcabb64b112de559bbbcddc2a91daee5cf9a76b84fb4bb SHA512 42bdbe8172ff5ff89469786f3d544db4a07bc0d1de9a54b8525dc8789d0f4328159ee815c07595463f190073433de567fb2d3496d261daa46aac70354b3da6ae -EBUILD kopeninghours-21.08.3.ebuild 1266 BLAKE2B 2300f8e1734e45840ad781e679fc860071c9f80774c09f0bed04d9a1adc56336252c5bcc18c8940b6532a9599d92cc4acc9bff4b5eaaa1bed0688c29e425002e SHA512 c80bc7a598e6df2ca2053fa9d3fda6fd5e222e1a91e704b1d0156fac6411b11980a0c443ee1c753471229f23e8ae3f9b4e73be1b11d64219c32cbf04d5cc2568 +DIST kopeninghours-22.04.0.tar.xz 69016 BLAKE2B 6e432bb2981b4eb62970fef37390ff871ee51a09e964434f2c43bf89de8ab2568b4843369fa99166fc731937989a155c9f391c2cc32c023f4be56ff886fabc60 SHA512 21bbd64000dec12015a5a2904f414876602a1b7096d6c64f4b327ed4d38d5a38d5058138a422c6fe41f7e205508b753b9d0502b1379d0e8816f1d4929d3fe45c EBUILD kopeninghours-21.12.3.ebuild 1284 BLAKE2B c412ac19980818679f764e00007985011fcb6824fbce05af1efcd7b0c4fd4d0a0f003e4195a9beb893fb489d60557e842ba20ef54d0ccd58fce1261ecc65566a SHA512 b30cfaea9be3a99b45a453934f599a79b344c04659e46a9825afd953bd7cbaeeb702ba80609c5f6271f15bb7190596e792c5dc72e6cf7dff38376f0dbd4064c8 +EBUILD kopeninghours-22.04.0.ebuild 1274 BLAKE2B c2b2156b59139558ed6428c73a567abe4de8624052fde7f9c1040a3d4acf923b1d168d3ba2743b625952fbad9a3cdcd124565e44a3e548d8d63e80763c4eefba SHA512 baa255cf4464b346ebecb3dcd7628e2a961b5dee458708347994ec5bf5dd1fec28e961db5c8ae5040e22b3e79ca100edf7db25a924c74682ab89fc7014d1e6e9 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch b/dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch new file mode 100644 index 000000000000..d51fb7d45ff8 --- /dev/null +++ b/dev-libs/kopeninghours/files/kopeninghours-22.04.0-boostpython.patch @@ -0,0 +1,79 @@ +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 "22") +@@ -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 ${Boost_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS}) ++target_link_libraries(PyKOpeningHours PUBLIC Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${Python3_LIBRARIES} KOpeningHours) ++target_include_directories(PyKOpeningHours PRIVATE ${Boost_INCLUDE_DIR} ${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/kopeninghours/kopeninghours-21.08.3.ebuild b/dev-libs/kopeninghours/kopeninghours-21.08.3.ebuild deleted file mode 100644 index bd46d6ad91b3..000000000000 --- a/dev-libs/kopeninghours/kopeninghours-21.08.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_GEAR="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.84.0 -QTMIN=5.15.2 -PYTHON_COMPAT=( python3_{8..10} ) -inherit ecm kde.org python-single-r1 - -DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions" -HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html -https://invent.kde.org/libraries/kopeninghours" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - >=dev-libs/kpublictransport-${PVCUT}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=kde-frameworks/kholidays-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - sys-libs/zlib - python? ( - $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - ${PYTHON_DEPS} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" -BDEPEND=" - sys-devel/bison - sys-devel/flex -" - -PATCHES=( "${FILESDIR}"/${PN}-21.03.90-boostpython.patch ) - -pkg_setup() { - ecm_pkg_setup - python_setup -} - -src_configure() { - local mycmakeargs=( - -DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON} - $(cmake_use_find_package python Boost) - ) - ecm_src_configure -} - -src_install() { - ecm_src_install - python_optimize -} diff --git a/dev-libs/kopeninghours/kopeninghours-22.04.0.ebuild b/dev-libs/kopeninghours/kopeninghours-22.04.0.ebuild new file mode 100644 index 000000000000..627bb806459e --- /dev/null +++ b/dev-libs/kopeninghours/kopeninghours-22.04.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="true" +ECM_TEST="true" +KDE_GEAR="true" +PVCUT=$(ver_cut 1-3) +KFMIN=5.92.0 +QTMIN=5.15.2 +PYTHON_COMPAT=( python3_{8..10} ) +inherit ecm kde.org python-single-r1 + +DESCRIPTION="Library for parsing and evaluating OSM opening hours expressions" +HOMEPAGE="https://api.kde.org/kopeninghours/html/index.html +https://invent.kde.org/libraries/kopeninghours" + +LICENSE="LGPL-2+" +SLOT="5" +KEYWORDS="~amd64" +IUSE="python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + >=dev-libs/kpublictransport-${PVCUT}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + sys-libs/zlib + python? ( + $(python_gen_cond_dep ' + >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + ${PYTHON_DEPS} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 +" +BDEPEND=" + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${FILESDIR}"/${P}-boostpython.patch ) + +pkg_setup() { + ecm_pkg_setup + python_setup +} + +src_configure() { + local mycmakeargs=( + -DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON} + $(cmake_use_find_package python Boost) + ) + ecm_src_configure +} + +src_install() { + ecm_src_install + python_optimize +} -- cgit v1.2.3