gentoo resync : 13.06.2020

4 files changed, 92 insertions, 3 deletions

diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index f1818b9cad94..6884fdead5c3 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,6 @@
+AUX hyperscan-5.2.1-locales.patch 793 BLAKE2B 7cb5711b7fe89fa91ec619846931d5bc4f9231443b4f11b2771cd75d82649e1c307022ee9c98cffdcee968667038f10b01fb060efbdb62a7d15a2a7ff7fa44ce SHA512 a7382661f97d49c985c639f27f3c60798e7c0e89e1983a757d5cf79cc6b504265f7e3cbee056edff5f513831aa6d2c60119eba47040fa8256d6bb08bfdb4af28
 DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
-EBUILD hyperscan-5.2.1-r1.ebuild 949 BLAKE2B de7ae9d3be49ab99e87cbd83e034d93ea4c15a4a1ecc361427dbcc1d7eef96dbffce793ec069f3e381a515e59ceb68c10f41095a4f7693c6991207ed4e6a5a93 SHA512 beb8eb1a464ec571cd1463b3b18b39a0dc038baa69532ac8531aacdeae700663351c5b2fef36064ccbb5da1216bad1e812d0f7cc97bd4d500d9726e1ec835b0f
+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 1193 BLAKE2B 3bfe5cbb0d1c80b8a4ca125a7fdfccb408b49c3ae89dbe9b15106222acaaf6e290445884a4d43b342479542c278b9bde3035d156a0483052ab0e491bb04338fd SHA512 e503cc7b9ee992e981927ba3d30890e59f3608d960dea1087a23f8240ace0155690f9bd7f7ddf635bed0954dbd9b8ef43a983626d81d77b68c20c858d5715bb2
 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
new file mode 100644
index 000000000000..985a6f130344
--- /dev/null
+++ b/dev-libs/hyperscan/files/hyperscan-5.2.1-locales.patch
@@ -0,0 +1,20 @@
+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
index aa7ab14e7067..6cfd5c07a2ef 100644
--- a/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit cmake flag-o-matic python-any-r1
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}"
@@ -25,16 +25,29 @@ BDEPEND="
 
 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
 }
diff --git a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
new file mode 100644
index 000000000000..2b2917b71023
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
@@ -0,0 +1,53 @@
+# 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"
+
+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
+}