diff options
Diffstat (limited to 'virtual/libffi/libffi-3.3_rc0.ebuild')
| -rw-r--r-- | virtual/libffi/libffi-3.3_rc0.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild index 318019a4b057..42ada5056389 100644 --- a/virtual/libffi/libffi-3.3_rc0.ebuild +++ b/virtual/libffi/libffi-3.3_rc0.ebuild @@ -10,6 +10,10 @@ inherit multilib-build DESCRIPTION="A virtual for the Foreign Function Interface implementation" SLOT="0/7" # SONAME=libffi.so.7 +<<<<<<< HEAD KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +======= +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]" |