diff options
Diffstat (limited to 'app-portage/portage-utils/portage-utils-0.80.ebuild')
| -rw-r--r-- | app-portage/portage-utils/portage-utils-0.80.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild index 28d05e1ebaf8..5af98dad7ebe 100644 --- a/app-portage/portage-utils/portage-utils-0.80.ebuild +++ b/app-portage/portage-utils/portage-utils-0.80.ebuild @@ -15,7 +15,11 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" +<<<<<<< HEAD KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next fi RDEPEND=" |