gentoo resync : 28.09.2019

9 files changed, 245 insertions, 106 deletions

diff --git a/app-crypt/af_alg/Manifest b/app-crypt/af_alg/Manifest
deleted file mode 100644
index 87d87e5e94f2..000000000000
--- a/app-crypt/af_alg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST af_alg-0.0.1.tar.gz 332007 BLAKE2B 05d26e08c5ed56bc94626bfd6883fce99a1e630fb3f8b7f4f2847889308df57279f347f5e847cfa65d1356fac606eb1a4798d07ce093415dd900328710e32975 SHA512 10860268dbff65e20d78c7d251b5ac4e63342e01c30af72894baa63a625f11900a77a8d0cca29d93bd3a06ae29c16c5fc4d71843e7379b7d948ad1b6e6b58b5b
-DIST af_alg-7b13512edbd77c35d20edb4e53d5d83eeaf05d52.tar.gz 5362 BLAKE2B 7d2423de81eae776b8f744747458c71b794656351cef56b7a4b4ffed049033a8367b598b075ac758f2e9e977d724d5a0b86c7c242ecb507d7d318bc7610071eb SHA512 c897a64ce12c5ecbdf8147a8776b646b9fed7d012cbc913e1f047eff4dd81fe1783733d64e711ab3702923b57055e4ca923cdf4f90bef6a4868f803be11239ca
-EBUILD af_alg-0.0.1.ebuild 1004 BLAKE2B 5f4a9166fb1f7a82b5451632448674f8307a2b9ff423b5e0758ec3fc4affe3c5fe34e67967b81c0d794ba6d01e83ab52b1e8f01a92f8783a68971e7a3886997a SHA512 e866279daa5ea16c83bd8b0135a68f069b9256e7da41992e84e86504f92ee3de8f761377f7ef0bff40c3822e1c453bab2a2a1d046115e6190b4f293ff9a3d42a
-EBUILD af_alg-0_pre20120229.ebuild 839 BLAKE2B 5684c4abbcc49ff0d75012cf9bea7c31eae0f460395170f540065c39da691889b312771273ddeeee9716fda2271d43bec25cdd9251414485035477ba896f02b3 SHA512 f0cdf0c4d7639ccbe3007feab6d321afa3620122095fd7eb90af4ac0e547ad4958cefd34aee2158db88dbcc21f11e9d4b678eaab110dce55a9319dca4c656ef8
-MISC metadata.xml 775 BLAKE2B 0fe9a6f6286366322ac68be18d4fd5bbf20b7f5ec303cc90f08f88742684c14243a8c0f3f6804335950ec35758f3fe646399a4c3f392f3e30713e6644842efbe SHA512 0e58d079d14a8559c56780c77eb6221ef1abba227b5b2c32306eed7d9b562b84724868488680adc2b21c3e810cd8700649d89cff0821583657b619c1a5ae4671
diff --git a/app-crypt/af_alg/af_alg-0.0.1.ebuild b/app-crypt/af_alg/af_alg-0.0.1.ebuild
deleted file mode 100644
index 5494c4339d9c..000000000000
--- a/app-crypt/af_alg/af_alg-0.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="af_alg"
-
-inherit autotools eutils libtool linux-info versionator
-
-DESCRIPTION="af_alg is an openssl crypto engine kernel interface thing"
-HOMEPAGE="https://github.com/sarnold/af_alg"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libressl"
-
-DEPEND="virtual/linux-sources
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND=""
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-CONFIG_CHECK="~CRYPTO_USER_API"
-WARNING_CRYPTO_USER_API="You need to enable CONFIG_CRYPTO_USER_API in order to use this package."
-
-src_prepare() {
-	sed -i -e "s|ssl/engines|engines|" "${S}"/configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-pic
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README.rst
-
-	prune_libtool_files --modules
-}
diff --git a/app-crypt/af_alg/af_alg-0_pre20120229.ebuild b/app-crypt/af_alg/af_alg-0_pre20120229.ebuild
deleted file mode 100644
index 1ca991a06c2c..000000000000
--- a/app-crypt/af_alg/af_alg-0_pre20120229.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-COMMIT_ID=7b13512edbd77c35d20edb4e53d5d83eeaf05d52
-
-DESCRIPTION="AF_ALG for OpenSSL"
-HOMEPAGE="http://carnivore.it/2011/04/23/openssl_-_af_alg"
-
-MY_P="$PN-${COMMIT_ID}"
-SRC_URI="http://src.carnivore.it/users/common/af_alg/snapshot/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wall -fPIC \
-		-shared -Wl,-soname,libaf_alg.so -lcrypto -o libaf_alg.so \
-		e_af_alg.c
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/engines
-	doexe libaf_alg.so
-	dodoc README
-}
diff --git a/app-crypt/af_alg/metadata.xml b/app-crypt/af_alg/metadata.xml
deleted file mode 100644
index 311413031703..000000000000
--- a/app-crypt/af_alg/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>nerdboy@gentoo.org</email>
-	<name>Stephen Arnold</name>
-</maintainer>
-<longdescription lang="en">
-af_alg implements an OpenSSL engine that uses the AF_ALG functionailty found in
-kernel &gt;= 2.6.38 for crypto offload. Be sure to actually check if it's faster,
-as for many modern systems, userspace software implementations are actually
-faster, as they avoid a kernel context switch. However, on embedded systems and
-others with crypto hardware, AF_ALG may be faster.  The upstream readme has more
-details.
-</longdescription>
-<upstream>
-	<remote-id type="github">sarnold/af_alg</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 545034440919..018da46e47a6 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,3 +1,6 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
+DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
+EBUILD gpgme-1.13.0-r1.ebuild 2900 BLAKE2B 2ef871fcfb4427bbf2457f30274acb63e253ce549d0bb0114fdb6b1356885c1c1fdaf8ac37c4c679a35e9cc840e27493bf991569bf6f04164c9fd3513a745800 SHA512 ddc4595d6151f410729fca30b34ed72732b2462d7fe8b7980c3b90f65d2968b2d06eb7cfc69b6c6a0f15e01a9a338da9eff5c0388ac80ae47879a034b7aafd01
 EBUILD gpgme-1.13.0.ebuild 2890 BLAKE2B ee19906844689d57db5864655076f3448f49f267c3286312125669b48b23e4b443b2cbe62edf8f1d8997dc76289562cc1815e015bae1877cbe63a1fac20da368 SHA512 2ec197b2772b15450916073ac2e0e99ca090e472b66ed1cfae00e8ed3fae593b8090863d0a63c27340a8df84e83f97372a15d7774748a27619cb97c502c5cbd9
+EBUILD gpgme-1.13.1.ebuild 2900 BLAKE2B 2ef871fcfb4427bbf2457f30274acb63e253ce549d0bb0114fdb6b1356885c1c1fdaf8ac37c4c679a35e9cc840e27493bf991569bf6f04164c9fd3513a745800 SHA512 ddc4595d6151f410729fca30b34ed72732b2462d7fe8b7980c3b90f65d2968b2d06eb7cfc69b6c6a0f15e01a9a338da9eff5c0388ac80ae47879a034b7aafd01
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..7c4ca43d823f
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.29:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+BDEPEND="python? ( dev-lang/swig )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	find "${D}" -name '*.la' -delete || die
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild b/app-crypt/gpgme/gpgme-1.13.1.ebuild
new file mode 100644
index 000000000000..7c4ca43d823f
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.29:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+	cxx? (
+		!<kde-apps/gpgmepp-4.14.11_pre20160611:4
+		!kde-apps/gpgmepp:5
+		!<kde-apps/kdepimlibs-4.14.10_p20160611:4
+		!=kde-apps/kdepimlibs-4.14.11_pre20160211*:4
+	)"
+BDEPEND="python? ( dev-lang/swig )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b"
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && make -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	find "${D}" -name '*.la' -delete || die
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index eae378291a7d..60c326314419 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +1,9 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
+<<<<<<< HEAD
 EBUILD libb2-0.98.1-r1.ebuild 1732 BLAKE2B 935c36d9cf85cb24511646e81c817627553897270d7d889f8ed00e5e7e19ba72630385aa18980094749d82507bbf1246c0fb56d9f4db6cf895deaa55d97526b2 SHA512 a470032f923e0ec8f2f6a8b8bc5a8f33e1df005c94bd302af221990d07daf36950d68e57ab05333c72393ebe0d1e8975327a338d6155035cd573143a3f487edb
+=======
+EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
+>>>>>>> next
 EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index 13c3204ccc37..b8eb0f5d9883 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -12,7 +12,11 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
+<<<<<<< HEAD
 KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+=======
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+>>>>>>> next
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="