commit: de6a411a842c7b581f4b0dfde3f37103dd707718 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Thu Jan 7 10:32:45 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 7 11:16:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6a411a
dev-libs/hyperscan: clean old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/18973 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/hyperscan/Manifest | 1 - .../hyperscan/files/hyperscan-5.2.1-locales.patch | 20 -------- dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild | 57 ---------------------- 3 files changed, 78 deletions(-) diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest index 2e5b6029c6a..1b136837059 100644 --- a/dev-libs/hyperscan/Manifest +++ b/dev-libs/hyperscan/Manifest @@ -1,2 +1 @@ -DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56 diff --git a/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch b/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch deleted file mode 100644 index 985a6f13034..00000000000 --- a/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83197af..297a3b3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -187,9 +187,9 @@ else() - set (EXEC_ARGS ${CC_ARG1} -c -Q --help=target -march=native -mtune=native) - execute_process(COMMAND ${CMAKE_C_COMPILER} ${EXEC_ARGS} - OUTPUT_VARIABLE _GCC_OUTPUT) -- string(FIND "${_GCC_OUTPUT}" "Known" POS) -- string(SUBSTRING "${_GCC_OUTPUT}" 0 ${POS} _GCC_OUTPUT) -- string(REGEX REPLACE ".*march=[ \t]*([^ \n]*)[ \n].*" "\\1" -+ string(FIND "${_GCC_OUTPUT}" "march" POS) -+ string(SUBSTRING "${_GCC_OUTPUT}" ${POS} -1 _GCC_OUTPUT) -+ string(REGEX REPLACE "march=[ \t]*([^ \n]*)[ \n].*" "\\1" - GNUCC_ARCH "${_GCC_OUTPUT}") - - # test the parsed flag --- -2.26.2 - diff --git a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild b/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild deleted file mode 100644 index 6cfd5c07a2e..00000000000 --- a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit cmake flag-o-matic python-any-r1 - -DESCRIPTION="High-performance regular expression matching library" -SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs" - -RDEPEND="dev-libs/boost" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/ragel -" - -REQUIRED_USE="cpu_flags_x86_ssse3" - -PATCHES=( - "${FILESDIR}/${P}-locales.patch" -) - -src_prepare() { - # Respect user -O flags - sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die - - # upstream workaround - append-cxxflags -Wno-redundant-move - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - - use cpu_flags_x86_ssse3 && append-flags -mssse3 - use cpu_flags_x86_avx2 && append-flags -mavx2 - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) - -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) - -DFAT_RUNTIME=false - ) - cmake_src_configure -} - -src_test() { - "${BUILD_DIR}"/bin/unit-hyperscan || die -}
