diff options
Diffstat (limited to 'sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild')
| -rw-r--r-- | sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild index 336f8a744c79..74adcf9a648d 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild @@ -15,7 +15,11 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz LICENSE="GPL-2" SLOT="0" +<<<<<<< HEAD KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris" +======= +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris" +>>>>>>> next IUSE="static-libs" RDEPEND="!sys-libs/com_err |