diff options
Diffstat (limited to 'dev-libs/libffi/libffi-3.3_rc0.ebuild')
| -rw-r--r-- | dev-libs/libffi/libffi-3.3_rc0.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild index 18a18785d98c..a9cdaa09a785 100644 --- a/dev-libs/libffi/libffi-3.3_rc0.ebuild +++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild @@ -13,7 +13,11 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta LICENSE="MIT" 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 IUSE="debug pax_kernel static-libs test" RDEPEND="" |