summaryrefslogtreecommitdiff
path: root/app-crypt/libb2/libb2-0.98.1-r1.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt/libb2/libb2-0.98.1-r1.ebuild')
-rw-r--r--app-crypt/libb2/libb2-0.98.1-r1.ebuild4
1 files changed, 4 insertions, 0 deletions
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="