1 |
commit: de6a411a842c7b581f4b0dfde3f37103dd707718 |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Thu Jan 7 10:32:45 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 7 11:16:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6a411a |
7 |
|
8 |
dev-libs/hyperscan: clean old |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18973 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-libs/hyperscan/Manifest | 1 - |
16 |
.../hyperscan/files/hyperscan-5.2.1-locales.patch | 20 -------- |
17 |
dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild | 57 ---------------------- |
18 |
3 files changed, 78 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest |
21 |
index 2e5b6029c6a..1b136837059 100644 |
22 |
--- a/dev-libs/hyperscan/Manifest |
23 |
+++ b/dev-libs/hyperscan/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c |
26 |
DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56 |
27 |
|
28 |
diff --git a/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch b/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch |
29 |
deleted file mode 100644 |
30 |
index 985a6f13034..00000000000 |
31 |
--- a/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch |
32 |
+++ /dev/null |
33 |
@@ -1,20 +0,0 @@ |
34 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
35 |
-index 83197af..297a3b3 100644 |
36 |
---- a/CMakeLists.txt |
37 |
-+++ b/CMakeLists.txt |
38 |
-@@ -187,9 +187,9 @@ else() |
39 |
- set (EXEC_ARGS ${CC_ARG1} -c -Q --help=target -march=native -mtune=native) |
40 |
- execute_process(COMMAND ${CMAKE_C_COMPILER} ${EXEC_ARGS} |
41 |
- OUTPUT_VARIABLE _GCC_OUTPUT) |
42 |
-- string(FIND "${_GCC_OUTPUT}" "Known" POS) |
43 |
-- string(SUBSTRING "${_GCC_OUTPUT}" 0 ${POS} _GCC_OUTPUT) |
44 |
-- string(REGEX REPLACE ".*march=[ \t]*([^ \n]*)[ \n].*" "\\1" |
45 |
-+ string(FIND "${_GCC_OUTPUT}" "march" POS) |
46 |
-+ string(SUBSTRING "${_GCC_OUTPUT}" ${POS} -1 _GCC_OUTPUT) |
47 |
-+ string(REGEX REPLACE "march=[ \t]*([^ \n]*)[ \n].*" "\\1" |
48 |
- GNUCC_ARCH "${_GCC_OUTPUT}") |
49 |
- |
50 |
- # test the parsed flag |
51 |
--- |
52 |
-2.26.2 |
53 |
- |
54 |
|
55 |
diff --git a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild b/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild |
56 |
deleted file mode 100644 |
57 |
index 6cfd5c07a2e..00000000000 |
58 |
--- a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild |
59 |
+++ /dev/null |
60 |
@@ -1,57 +0,0 @@ |
61 |
-# Copyright 1999-2020 Gentoo Authors |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
- |
64 |
-EAPI=7 |
65 |
- |
66 |
-PYTHON_COMPAT=( python3_{6..9} ) |
67 |
- |
68 |
-inherit cmake flag-o-matic python-any-r1 |
69 |
- |
70 |
-DESCRIPTION="High-performance regular expression matching library" |
71 |
-SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
72 |
-HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan" |
73 |
- |
74 |
-LICENSE="BSD" |
75 |
-SLOT="0" |
76 |
-KEYWORDS="~amd64 ~x86" |
77 |
-IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs" |
78 |
- |
79 |
-RDEPEND="dev-libs/boost" |
80 |
-DEPEND="${RDEPEND}" |
81 |
-BDEPEND=" |
82 |
- ${PYTHON_DEPS} |
83 |
- dev-util/ragel |
84 |
-" |
85 |
- |
86 |
-REQUIRED_USE="cpu_flags_x86_ssse3" |
87 |
- |
88 |
-PATCHES=( |
89 |
- "${FILESDIR}/${P}-locales.patch" |
90 |
-) |
91 |
- |
92 |
-src_prepare() { |
93 |
- # Respect user -O flags |
94 |
- sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die |
95 |
- |
96 |
- # upstream workaround |
97 |
- append-cxxflags -Wno-redundant-move |
98 |
- cmake_src_prepare |
99 |
-} |
100 |
- |
101 |
-src_configure() { |
102 |
- CMAKE_BUILD_TYPE=Release |
103 |
- |
104 |
- use cpu_flags_x86_ssse3 && append-flags -mssse3 |
105 |
- use cpu_flags_x86_avx2 && append-flags -mavx2 |
106 |
- |
107 |
- local mycmakeargs=( |
108 |
- -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) |
109 |
- -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) |
110 |
- -DFAT_RUNTIME=false |
111 |
- ) |
112 |
- cmake_src_configure |
113 |
-} |
114 |
- |
115 |
-src_test() { |
116 |
- "${BUILD_DIR}"/bin/unit-hyperscan || die |
117 |
-} |