diff options
Diffstat (limited to 'dev-libs/nss/nss-3.46.ebuild')
| -rw-r--r-- | dev-libs/nss/nss-3.46.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild index 2ee3ca3946df..82194713c45e 100644 --- a/dev-libs/nss/nss-3.46.ebuild +++ b/dev-libs/nss/nss-3.46.ebuild @@ -19,7 +19,11 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" +<<<<<<< HEAD KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +======= +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next IUSE="cacert +nss-pem utils" CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" |