gentoo resync : 10.02.2020

5 files changed, 56 insertions, 13 deletions

diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 9197904b91e7..0ba39be6833c 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,7 +1,9 @@
 DIST hyperscan-5.1.0.tar.gz 1810559 BLAKE2B 0946b3afe00cdce51b82852515ffe674729854d762854c252ba90fc73cbdc23205fe75f8e6c4e976efb31bf10950076b5790bd9692768dabcbd642d53e739c32 SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
 DIST hyperscan-5.1.1.tar.gz 1811275 BLAKE2B 524f1fbdfd470cd12ebb0ab4e122a97f6a90a1027adfa0850921a8f80c09f87792fed3da6b10367336b1e84987414bda93b98aa30aa9ff6dd899bf29fdd4294a SHA512 2812174890f775bc0c99019afe49cfde9ecc1107626cb4f1c9e1518228d090cba43bc15a19beaa00bae2a8a3dad85e7f27d4b237973360a294db78098fcb8508
 DIST hyperscan-5.2.0.tar.gz 1818751 BLAKE2B 4d74a4d022a59ee37c7df274ff1a37153898aa403bdfa3ec39df7304f7f65bcae1bbc074a2801223ef00903a5b8a01845e985c2ad196496d40899bab79df3844 SHA512 4d56e2d02dfbedf3caa8b212dae2ac3575b343b1ed2a75e91f6074ef265bbc28cfb78ad7f08dc47d7cc2e3e3e02e488c4cb75efacc41755f993236d97ddcb4cc
-EBUILD hyperscan-5.1.0.ebuild 778 BLAKE2B 284cbe1b20de0502a6f0b37dcab5993a4dac89d35d7806f56c90bfed11bf533187a8b5e2efd60f82bdb6e697674feed6a308a869f77f9c197c819fb43f4ed09b SHA512 0dc0f886dbe41fd7a2ac437586e664cc8fb7a65480698ad28e743342fd23303291df88450686836f0affe5e7bd5f15fae4319298db915112a12556bd8f9da9fd
-EBUILD hyperscan-5.1.1.ebuild 875 BLAKE2B c75b0928f76f19df13f2af28c804b84f1243eb95c8fd65ca5ee103c34150e0082efe63eb365f7891484cbddf28014afcae556bb275db017504c59d0656a4a517 SHA512 ddea5e7a39ce0586f3e715b885d2c8e01953bc401f7755a2c278c50ae3147a4be96fa45fc9fff956fdb47c303354df0d45f9f386da5b1b77008070ceaf0a8110
-EBUILD hyperscan-5.2.0.ebuild 875 BLAKE2B c75b0928f76f19df13f2af28c804b84f1243eb95c8fd65ca5ee103c34150e0082efe63eb365f7891484cbddf28014afcae556bb275db017504c59d0656a4a517 SHA512 ddea5e7a39ce0586f3e715b885d2c8e01953bc401f7755a2c278c50ae3147a4be96fa45fc9fff956fdb47c303354df0d45f9f386da5b1b77008070ceaf0a8110
+DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
+EBUILD hyperscan-5.1.0.ebuild 813 BLAKE2B c9b2941dd08d11cf53c5180d5f45a4091185f94198c57a9f72ceb595015c84f355dcce7fac7e72dbd02ccf8fe4e21b14fcb50d270df2ba213f76c4c74adc3318 SHA512 60473762453443d896b96ff005ae58495e136f1bea3fa31380eba2747012ea73f886c2126ac5410a052b537f61ba345a52a6bac784dea6559739e3379db02317
+EBUILD hyperscan-5.1.1.ebuild 911 BLAKE2B 041491b397dd7f4ed9af4649d85c01f8e439d2f083e5a55274c6007e3d58191e5c792357333694b689eae39149a43e1f1cbe8dbc95f8beda235857cb57872e16 SHA512 d90ce5d7baeff45e00cf3d34cf94c336e7c62d3a41b837739206dc96c883acff091e3a6c483cfb6185a4f723cdefd13b20ce7ab42491dac1e59700ea1637e6f1
+EBUILD hyperscan-5.2.0.ebuild 911 BLAKE2B 041491b397dd7f4ed9af4649d85c01f8e439d2f083e5a55274c6007e3d58191e5c792357333694b689eae39149a43e1f1cbe8dbc95f8beda235857cb57872e16 SHA512 d90ce5d7baeff45e00cf3d34cf94c336e7c62d3a41b837739206dc96c883acff091e3a6c483cfb6185a4f723cdefd13b20ce7ab42491dac1e59700ea1637e6f1
+EBUILD hyperscan-5.2.1.ebuild 960 BLAKE2B 405bb4bd788e4471e6ba89a8d26df888d84e975240123be0eb598c4f5bee34d7c45920488ab14be4efba2bfcedd32d639041f4dd6bd7a45a4ebf9d5927fcd5e1 SHA512 3bf42a53408fe604a456109e6ce0671c57708d4c929af095d8c07d3e66e35e25c2db9f44c4af43054d2fc2fd85e6ddbae501911c1b8a1b75de2d9fa0d2091bfa
 MISC metadata.xml 444 BLAKE2B 135788c6bce69014c87cd2e80660f5ab8563afb0e2bddf281245d64e9787318b8b4cfa743d0d2648b40f40ce909dfe5a8677fe00114311c4d8ea88b037ff9afd SHA512 8b3dd40cc7b43125b2a7297c991143d74a5d3cbb70e0d5608ede859987cd27cae0a27b92c46419746d56a0f88252e6cb75ad6111ac25e920ba4e46acc8caa423
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
index ec3fa0a718e4..52d8497da64c 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1
 
 DESCRIPTION="High-performance regular expression matching library"
-HOMEPAGE="https://01.org/hyperscan"
-
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
index f21c9535c2df..42551e93ced8 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
+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"
diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
index f21c9535c2df..42551e93ced8 100644
--- a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
+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"
diff --git a/dev-libs/hyperscan/hyperscan-5.2.1.ebuild b/dev-libs/hyperscan/hyperscan-5.2.1.ebuild
new file mode 100644
index 000000000000..8789fd913c71
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake python-r1 flag-o-matic
+
+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_ssse3 static-libs"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/ragel"
+
+REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# upstream workaround
+	append-cxxflags -Wno-redundant-move
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/bin/unit-hyperscan || die
+}