diff options
Diffstat (limited to 'metadata/md5-cache/app-crypt')
| -rw-r--r-- | metadata/md5-cache/app-crypt/Manifest.gz | bin | 41827 -> 41843 bytes | |||
| -rw-r--r-- | metadata/md5-cache/app-crypt/libb2-0.98.1-r1 | 8 | ||||
| -rw-r--r-- | metadata/md5-cache/app-crypt/mit-krb5-1.17-r1 | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz Binary files differindex 7ad9e32f5160..5919e436621e 100644 --- a/metadata/md5-cache/app-crypt/Manifest.gz +++ b/metadata/md5-cache/app-crypt/Manifest.gz diff --git a/metadata/md5-cache/app-crypt/libb2-0.98.1-r1 b/metadata/md5-cache/app-crypt/libb2-0.98.1-r1 index 87f16d4684e9..0256debe6b74 100644 --- a/metadata/md5-cache/app-crypt/libb2-0.98.1-r1 +++ b/metadata/md5-cache/app-crypt/libb2-0.98.1-r1 @@ -4,10 +4,18 @@ DESCRIPTION=C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp EAPI=6 HOMEPAGE=https://github.com/BLAKE2/libb2 IUSE=static-libs native-cflags openmp +<<<<<<< HEAD +KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +======= KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +>>>>>>> next LICENSE=CC0-1.0 RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) SLOT=0 SRC_URI=https://github.com/BLAKE2/libb2/archive/73d41c8255a991ed2adea41c108b388d9d14b449.tar.gz -> libb2-0.98.1.tar.gz _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +<<<<<<< HEAD +_md5_=5d6780a41b36492158e6583310223771 +======= _md5_=fc897942210631b7b1c237bfe69ff287 +>>>>>>> next diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1 index 5df7dc483730..c67ccf76db81 100644 --- a/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1 +++ b/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1 @@ -11,5 +11,9 @@ RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_ RESTRICT=test SLOT=0 SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-1.17.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=613eb82f727d988cefec1b0c1300b59a |