gentoo resync : 08.01.2021

4 files changed, 3 insertions, 83 deletions

diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index e69747cd631a..ebe84eb6f134 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,6 +1,3 @@
-AUX hyperscan-5.2.1-locales.patch 793 BLAKE2B 7cb5711b7fe89fa91ec619846931d5bc4f9231443b4f11b2771cd75d82649e1c307022ee9c98cffdcee968667038f10b01fb060efbdb62a7d15a2a7ff7fa44ce SHA512 a7382661f97d49c985c639f27f3c60798e7c0e89e1983a757d5cf79cc6b504265f7e3cbee056edff5f513831aa6d2c60119eba47040fa8256d6bb08bfdb4af28
-DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
 DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
-EBUILD hyperscan-5.2.1-r1.ebuild 1240 BLAKE2B 38e188a8fdab2309acc5dc3f9cf063fd05a6ffebaea2f221c8c4a60851d0198458cbc316d72be29b99869bf44fe695d5bbf1616e597e7b065572b2f14385b253 SHA512 096881916305952a15a2ea608d6dd5031818feff132c93ff2b7dd43240920ad3af14f5739b7b280cdebc68663122d693387611241719c17e35aa496c5b0e00cf
-EBUILD hyperscan-5.3.0.ebuild 1192 BLAKE2B 52b876886117066d9ac82fe9a37ccc7a37b09b0c1495815fdb0c172648364067e948931ea19f11d165ebe2917d361f8fca81bf8bdd5efefe914cb1d03ee42956 SHA512 1c2f81a794d72c9416bd624a4f8257b14df01e8f8fba429f3b8b4dd3e39703c36da84dedcdad5ff1906121522ab7f91f5db5e9100ab1362c4a60719a15724f68
+EBUILD hyperscan-5.3.0.ebuild 1191 BLAKE2B f0bf124f5646a11ff6c827ad1ededd174608022dfd161f33fb7ff6530859ba36578bbc8fecc473be328fc048b66f5719356a4b78cf5f2d67e278f60bc1cb7d4b SHA512 4a6407daeaae14499cfba022eeb43868e6a3b0dc4ebaab1ba0ed6394b507b037fe8bef1933b6f17d4d02868f08b259c8e66a891d8d4bdc2d159644ceb50294f6
 MISC metadata.xml 548 BLAKE2B d68c6cd73543c82ec12d2b05651ef2de0a3e402a3a3b28d827e87026f5576a1db23e52fa04021967cd919aeb828bdabc931ccf2e0238294c84c0f3f1d27dbee2 SHA512 5005d5ee96a915866096f63075a5ff76a49474807a63d846151ebbb411fe0c477c3b6883d97438018a69fb78c917b190de8768a44296caf7ca11451b7cbf587a
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 985a6f130344..000000000000
--- 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 6cfd5c07a2ef..000000000000
--- 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
-}
diff --git a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
index 287e21a54827..a85c63cc9fe7 100644
--- a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost"