summaryrefslogtreecommitdiff
path: root/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild')
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
index e8d3b12ae9d9..5d0c596e0286 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
@@ -13,7 +13,11 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
+<<<<<<< HEAD
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+=======
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+>>>>>>> next
IUSE="cron fuse nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}