summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-libs/nspr-4.22
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/dev-libs/nspr-4.22
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/md5-cache/dev-libs/nspr-4.22')
-rw-r--r--metadata/md5-cache/dev-libs/nspr-4.2212
1 files changed, 2 insertions, 10 deletions
diff --git a/metadata/md5-cache/dev-libs/nspr-4.22 b/metadata/md5-cache/dev-libs/nspr-4.22
index b982df99ad98..bcb467b65201 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.22
+++ b/metadata/md5-cache/dev-libs/nspr-4.22
@@ -4,17 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
EAPI=7
HOMEPAGE=http://www.mozilla.org/projects/nspr/
IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-<<<<<<< HEAD
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-=======
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
->>>>>>> next
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
SLOT=0
SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.22/src/nspr-4.22.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
-<<<<<<< HEAD
-_md5_=0968c661468f7e2950f33f7200a35276
-=======
-_md5_=ea78f6c67030ae57353c8ce20300a8bc
->>>>>>> next
+_md5_=a05e2201cb13a9dfe83dd41dd584a8ce