From 6cef603bfc4353c863a1a0b460a0aa882d2dc51c Mon Sep 17 00:00:00 2001 From: V3n3RiX <venerix@koprulu.sector> Date: Tue, 30 Aug 2022 22:49:20 +0100 Subject: gentoo auto-resync : 30:08:2022 - 22:49:20 --- dev-util/Manifest.gz | Bin 68516 -> 68520 bytes dev-util/cvise/Manifest | 3 +- dev-util/cvise/cvise-2.5.0-r1.ebuild | 76 +++++++++++++++++++++ dev-util/cvise/cvise-2.5.0.ebuild | 72 ------------------- .../cvise/files/cvise-2.5.0-no-werror-cflags.patch | 34 +++++++++ 5 files changed, 112 insertions(+), 73 deletions(-) create mode 100644 dev-util/cvise/cvise-2.5.0-r1.ebuild delete mode 100644 dev-util/cvise/cvise-2.5.0.ebuild create mode 100644 dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index e98aa5d33fd9..9dbf5cb7d36c 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest index 7ac33d0c92ff..2b717afbc14d 100644 --- a/dev-util/cvise/Manifest +++ b/dev-util/cvise/Manifest @@ -1,5 +1,6 @@ +AUX cvise-2.5.0-no-werror-cflags.patch 1830 BLAKE2B 864cde94daabb54e691e59a3634e7cc7ff72dea86a41f757f6d3d764629a803de92950e6abc32f33738c361e5e6bdacffb09c214039c2ee0475fbf1c41366cd6 SHA512 e68e51ecda7005b6542589f3ce958ad5ffef17c72e19a38f9d2be2d1443dc77adb11d4984dfc690cc25cbcb3e1da1c2fc848b9d8869178a7d4eca479ea2d7007 DIST cvise-2.4.0.tar.gz 252810 BLAKE2B a95d1645192886d8871dcdf7f9cdfa5a2ac615a3bbc24782c0966d1872fe5f3ade7ddb82afabecfcdebfdac257e2e13e6cb99ab7320baee1a4b43ab360e6a0b2 SHA512 073e53039d2b077fed43b948e0c01dc662ef4f75b92d7f49d1786a35c36412fed02e1931c6a39ce902452056fe5c7d70daa35a9cae18b44009778837261cae19 DIST cvise-2.5.0.tar.gz 255587 BLAKE2B ec33bcb0ac45bf89a66bd30b22386f5c0b994e774c1d30f7869e15bcd5bada2e511ad4028628af6c545a23fddde7bc43978fc63cc3b5168db8d038aec9310073 SHA512 8433d4daf0e0691b99ff78f4b5331da0d230d5872c214ffd4a7dee470d955c2a3d7541c19277555a6e97108f8cd3de589b3f724e2874c44e479e351777c671c4 EBUILD cvise-2.4.0-r2.ebuild 1417 BLAKE2B d8293e4b88aaef43886b2993b32e52b4230fead987667414444e26b0aeeba4c93a96d58f7e621f6caa162fcfcb6c7378863eeee69a4b542a0bd8e564aca6914e SHA512 9de9c7cc8d48fef5f515c9a11166e86decd97654f80e41dec53a093203bfac61a042c06090919df7cd12d17b529e2756df91ea95cdd92351a0d99d9be24cc8f1 -EBUILD cvise-2.5.0.ebuild 1290 BLAKE2B d5500da330f746d81cc57bfb62f6e692c3f13be3e3f91f6bad2d6e6e30c4e8462543de6a76927653debb2b1b472e067c31a1c23b2a5f6728ce8c71f3e2413e94 SHA512 952f32de66eff39a5170952b2309c807c880df2e13f227c63748e32f953d19dc74819bf2063190183b234e44564544c87325675de4fdcf7e0c2bde2032876964 +EBUILD cvise-2.5.0-r1.ebuild 1353 BLAKE2B 06d3f7664d4879d8407cf4073b5a4bb3aa9ea1fbedac93854ffeacfa49d535ad45227a15695df32abfa98212796147aea4f1cf0b2787e6b9fdbae81ac35794d0 SHA512 7f2da924a4a8c847ed3089ed0f38af56285b642cc08e62f94cdb61f7c014ef37debd7aac4fbfef914da9e25ffe47d304c44b22b95d15457003060f7a2ae23c64 MISC metadata.xml 325 BLAKE2B 52e58fd0c3babe2c595399ff2878b758960d089b0cefc0f8589365704f3628a93688d5b6ee06e88e54a4435ac0280d8cf542c37c079d149e44a2a64cd4db12c2 SHA512 9e509c76ab4cf07804997751996b5c73efc04839a1d6e2bd4b98c5ad2ffde0fb1008332f1b52bbf0985d65ceed73ccdf101c62a9b7d0bb1f5694083d1e33afb9 diff --git a/dev-util/cvise/cvise-2.5.0-r1.ebuild b/dev-util/cvise/cvise-2.5.0-r1.ebuild new file mode 100644 index 000000000000..ed819e732b93 --- /dev/null +++ b/dev-util/cvise/cvise-2.5.0-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake llvm python-single-r1 + +DESCRIPTION="Super-parallel Python port of the C-Reduce" +HOMEPAGE="https://github.com/marxin/cvise/" +SRC_URI=" + https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +LLVM_MAX_SLOT=15 +DEPEND=" + || ( + sys-devel/clang:15 + sys-devel/clang:14 + sys-devel/clang:13 + ) + <sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):= +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/pebble[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ') + dev-util/unifdef + sys-devel/flex +" +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/flex + test? ( + $(python_gen_cond_dep ' + dev-python/pebble[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.0-no-werror-cflags.patch +) + +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + python-single-r1_pkg_setup + llvm_pkg_setup +} + +src_test() { + cd "${BUILD_DIR}" || die + epytest +} + +src_install() { + cmake_src_install + + python_fix_shebang "${ED}"/usr/bin/cvise +} diff --git a/dev-util/cvise/cvise-2.5.0.ebuild b/dev-util/cvise/cvise-2.5.0.ebuild deleted file mode 100644 index 05efec46a120..000000000000 --- a/dev-util/cvise/cvise-2.5.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit cmake llvm python-single-r1 - -DESCRIPTION="Super-parallel Python port of the C-Reduce" -HOMEPAGE="https://github.com/marxin/cvise/" -SRC_URI=" - https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz -" - -LICENSE="UoI-NCSA" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -LLVM_MAX_SLOT=15 -DEPEND=" - || ( - sys-devel/clang:15 - sys-devel/clang:14 - sys-devel/clang:13 - ) - <sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):= -" -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/pebble[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ') - dev-util/unifdef - sys-devel/flex -" -BDEPEND=" - ${PYTHON_DEPS} - sys-devel/flex - test? ( - $(python_gen_cond_dep ' - dev-python/pebble[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ') - ) -" - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - python-single-r1_pkg_setup - llvm_pkg_setup -} - -src_test() { - cd "${BUILD_DIR}" || die - epytest -} - -src_install() { - cmake_src_install - - python_fix_shebang "${ED}"/usr/bin/cvise -} diff --git a/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch b/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch new file mode 100644 index 000000000000..b00b524cb2a4 --- /dev/null +++ b/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/867424 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,13 +146,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" + OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + # XXX figure out how to get "-std=c++14 -fno-rtti" from LLVM. That's how we + # get those options in the Automake path... +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wno-error=maybe-uninitialized") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Werror -Wno-error=maybe-uninitialized") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-error=maybe-uninitialized") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Wno-error=maybe-uninitialized") + if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + endif() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O3") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}") + endif() + + ############################################################################### +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 261a0fb..cbaebc3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,8 +151,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" + if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + endif() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}") + endif() + + ############################################################################### -- cgit v1.2.3