summaryrefslogtreecommitdiff
path: root/app-arch
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/Manifest.gzbin16406 -> 16403 bytes
-rw-r--r--app-arch/lz4/Manifest4
-rw-r--r--app-arch/lz4/lz4-1.9.2.ebuild4
-rw-r--r--app-arch/unrar/Manifest3
4 files changed, 11 insertions, 0 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9fde2b84ec7e..365ea121dbbf 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
Binary files differ
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 970c28680ca7..707ce64beed8 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -3,6 +3,10 @@ DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da6
DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+<<<<<<< HEAD
+EBUILD lz4-1.9.2.ebuild 914 BLAKE2B 17ccd03f4c90a6973a0bc5f7f9ee6624a9fa7adc3ea5b54c5e0359e81dd9e05e25ee0021b526faef9fa6e02fd910c553b44652ad9908c64c17229b16a2443c80 SHA512 d5db3864b0ece8d826d57dd689b0614329b1fc4ca6492829056cb12883fa8110822781aadbc6fb9cf9c96d3a22ddd0f9dd200093adea582028c2592321479cb5
+=======
EBUILD lz4-1.9.2.ebuild 911 BLAKE2B ce27a83c0cb654c501ddc75529a5474e9eb1c4b91b19cd4681f740b188df16e3fcea491de6a6a383ff4be326a70000ee5f60b608aa7503f651e9902526e0d72f SHA512 d33c13af38282e5c3afdc5e61f55f2b40973c06555d5db61bd412185179b5103221babebca007dab72ad7615d4a79c6c5059442bc152ddb0b94f5e9dc0e843d0
+>>>>>>> next
EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index f49e9816e094..d0dfbdbe0e15 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -11,7 +11,11 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH=dev
else
SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+<<<<<<< HEAD
+ KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~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 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+>>>>>>> next
fi
DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 88745a1253f3..a1f38936fb49 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,7 +2,10 @@ AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d
AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
DIST unrar-5.8.1.tar.gz 228917 BLAKE2B 4b34fd35a371ea2784af0968a95270b04afbefd4968c74c44e88d7b79598fe05b01c331ce730cbfd2535d5a713049e7f4dfbd38d28266e957ae9995cf8ce54b3 SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612
+<<<<<<< HEAD
+=======
DIST unrar-5.8.2.tar.gz 229116 BLAKE2B 88bcc90e36d231dd35b066495967a116571ce25b6cc6ee73e84ded5a56fd74662e0c9da10a7e7025d2cecbdd1e47d84f303207b6a466c1488168f523e7fb23fd SHA512 09f12f141925aa99d74d4a0a0f3bacdd5b53d174473346de317cf95c1f560ef4bad445f14d81d313f8a34e8400df6a76709d068b9cd23433d1f638935185ab0d
+>>>>>>> next
EBUILD unrar-5.7.5.ebuild 1882 BLAKE2B 469b7c10834d06442bf6687909300efc774579673b3443ec5e415368c25a485f84dd80bf4e4a3603c4ff0807e6947c84c325b712c2f44c128d0ca6336f1c22a7 SHA512 7f2c73c399d917e44b5dd19b979938d6bd9a8e1ca56a01cf2a1f8347ab46e5181029aad02e316ef2a7752ddfac45dc79609a39339315765219011ac4007620b9
EBUILD unrar-5.8.1.ebuild 1902 BLAKE2B 0b6cf0e2c32279ef92e21c68358c68e778da9fbd2e9727737ff16751695316b535b22c5ebc86a88e17b741c9cd97aa5e7608d8ed930aa735695eae944c356952 SHA512 5c7d1dee03603eab1464dcf87fc5858cd00a9d601a9ce4226068265936b1f0df402bf2e103a4add4db9fd948a60744f1898d124b621882b0228b10351090a867
EBUILD unrar-5.8.2.ebuild 1902 BLAKE2B 0b6cf0e2c32279ef92e21c68358c68e778da9fbd2e9727737ff16751695316b535b22c5ebc86a88e17b741c9cd97aa5e7608d8ed930aa735695eae944c356952 SHA512 5c7d1dee03603eab1464dcf87fc5858cd00a9d601a9ce4226068265936b1f0df402bf2e103a4add4db9fd948a60744f1898d124b621882b0228b10351090a867