diff options
1762 files changed, 10159 insertions, 47 deletions
@@ -1,6 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +<<<<<<< HEAD +MANIFEST Manifest.files.gz 29632 BLAKE2B ed1f7816d1da2f33d6db863d9723327c69b6cb834b875f8290fa29eefe723e53ca95ff0bf53a38a3700c171e5c6a882417577022e3593afadbd9324dfffea092 SHA512 7ace8ac52b3015be764d340dae7c6a4a0f4103fcf55fb70a63089dac7a0d234d9901b0d5d2580faab8c0cce7e356e2627bdb5daad8fbfef0924a5e3514dceb20 +TIMESTAMP 2019-09-25T17:39:05Z +-----BEGIN PGP SIGNATURE----- + +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2LpjlfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx +RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY +klDwoxAAhW7IaSdDzjNLTfsNykO5zNjIxXF3lso3lW+iTVXgi2ZPMOxuge1K6Rxh +YC4LD6NJEgQtlSXShQhDB5Lf5Ld9E5oDxJU8k36GEEJA9Hycr9DEW2FqIaqZN2Bd +MyR9tU3z2lcoPcboUXyUOePO28AsWv6IBxDSQzKKjHino8z4qkPRTEpl9BCdonWo +lxToi+rvQ/U2MVwE3s8zROtZaHon/4btnlu2y+hFXO4zjopYxB1r9I/V8yn9yriP +xzJR7zxramDSmZUYgeaRQpiWit12iHcE6wbEUFICWxr2JYWiJxqt4AKig+ob5txY +RokigUk3oshbpLZ3oWWGvU9nr2vA0Zw8NW7nYvnUD7dWKoaSa1LjO/s886sDgksb +JbCBblv+qYGLqgarD6UBaANX/JtRaEuuPHTwtI919++HTqBQ9UDxys3fUUKk1Fr/ +nD3XziNRHT8SnMlvhy8Dvn5WU9gNFg5uQaqk9C+2aOWOBtczAmDrQxKrPxvM9qUN +YwOWcmhA9SAtcJ+7sc0nsLxx1KSeK2HyUPu7e3H4B4QxPCfSE4hQKF+ep5alVuR5 +9ySWWb4rfJ2BplwZJBn8R29vB9sE5+aY7fkC+OAW0Nq5F9iwr6re1Ui4m0cl7yRE +9L9IHIZCglFEPQe1LZiUKSRDpXmd6bf4VMgB+FP1rSAgqKL2DPE= +=Agss +======= MANIFEST Manifest.files.gz 29596 BLAKE2B 5a563e8b1c35d49483009a3c0a3584c45223dc08669b6d343a398048bed14216fa8c67e951223d01ba38f0350f79fdf79fb2e5a649295aa9db7a2f21aa32a507 SHA512 025e08feea505435f5da06653ab09c55831112eb9a0f2a2a4c9e0c8fdcc8352aef711710de9447f62841ccff85e2a2f6535b19d9b99f0070c953ba84c18ecf98 TIMESTAMP 2019-09-28T05:09:01Z -----BEGIN PGP SIGNATURE----- @@ -20,4 +41,5 @@ QgvpVq6fw5X2TmZOYuQF5UIMxzkfwSIcbOnN73/gEII/BVVY2qhYpxidQUzo+36W VHgxah93rc7+K05EJvOzRNMCs3ldr6PVrI9AdJaivrPWw9QsqSy/PaGpaPQL80Le NIZ+QK+1y/iH6wMGuXTHEV9GNAjGJg0wxL7gy683wkAknujjsRM= =ul2O +>>>>>>> next -----END PGP SIGNATURE----- diff --git a/Manifest.files.gz b/Manifest.files.gz Binary files differindex 1602ce097241..252c1218368b 100644 --- a/Manifest.files.gz +++ b/Manifest.files.gz diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz Binary files differindex 218b3ab822e6..133c5e7fb48b 100644 --- a/acct-group/Manifest.gz +++ b/acct-group/Manifest.gz diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz Binary files differindex ed47eb72f951..9b4ccd0f010c 100644 --- a/acct-user/Manifest.gz +++ b/acct-user/Manifest.gz diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 0ff5bd1c5416..bb64917acf90 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest index e43863480f3f..343214853e98 100644 --- a/app-admin/consul-template/Manifest +++ b/app-admin/consul-template/Manifest @@ -3,6 +3,9 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1 DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170 +<<<<<<< HEAD +EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7 +======= DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852 DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395 @@ -46,4 +49,5 @@ DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896 EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7 EBUILD consul-template-0.22.0.ebuild 3306 BLAKE2B b5c6f9977cc1ac9f497b9c543729921c2ac036c1ed75272094e95029ffe2f1bf68aad307574ec55cc1a39ed2f80d8d2535f280ef635a586f359b0cc0e9a519b8 SHA512 bb59f560b81f53a4fa41fbf71fb9af6b728518d6c9769da86332f5f8863f7546bbe6362801bd2b4eb830d926a07bae7a6d8182fe12088b30ac407f4e1d162af4 +>>>>>>> next MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest index 7918a9929ec5..a0e313f863cc 100644 --- a/app-admin/mongo-tools/Manifest +++ b/app-admin/mongo-tools/Manifest @@ -8,6 +8,10 @@ EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8d EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb +<<<<<<< HEAD +EBUILD mongo-tools-4.0.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a +======= EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb +>>>>>>> next EBUILD mongo-tools-4.2.0.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz Binary files differindex 9fde2b84ec7e..365ea121dbbf 100644 --- a/app-arch/Manifest.gz +++ b/app-arch/Manifest.gz 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 diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz Binary files differindex 0439347477ff..afd27b4453d6 100644 --- a/app-crypt/Manifest.gz +++ b/app-crypt/Manifest.gz diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest index f1eec11229a7..60c326314419 100644 --- a/app-crypt/libb2/Manifest +++ b/app-crypt/libb2/Manifest @@ -1,5 +1,9 @@ DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073 +<<<<<<< HEAD +EBUILD libb2-0.98.1-r1.ebuild 1732 BLAKE2B 935c36d9cf85cb24511646e81c817627553897270d7d889f8ed00e5e7e19ba72630385aa18980094749d82507bbf1246c0fb56d9f4db6cf895deaa55d97526b2 SHA512 a470032f923e0ec8f2f6a8b8bc5a8f33e1df005c94bd302af221990d07daf36950d68e57ab05333c72393ebe0d1e8975327a338d6155035cd573143a3f487edb +======= EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01 +>>>>>>> next EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11 diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild index 0cd884df7321..b8eb0f5d9883 100644 --- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild +++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild @@ -12,7 +12,11 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g LICENSE="CC0-1.0" SLOT="0" +<<<<<<< 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 IUSE="static-libs native-cflags openmp" DEPEND=" diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 1bb1839deaae..da08244a0ca7 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 06483803cd18..baa46f2fd138 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,7 +1,13 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7 +<<<<<<< HEAD +EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d +EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef +MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9 +======= DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22 EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d EBUILD neovim-0.4.2.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b EBUILD neovim-9999.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b MISC metadata.xml 862 BLAKE2B e9725c43d1a34d8da4fd779a2a945594914ed51a2fc0b87a9a2a6ddefcc8d38d88c94c426a59df9f94b08045b2f8820ee205e7982a19c15f1872d2a73b35fae6 SHA512 9eb46f7862d26c27f400d22023ac3cc81f5671e8b17d4f52b0743abcfdf53d63366cd16c06ac1e391f02bf35fb9b70e0864eda9457c1f45ff74a06f528d1b8a7 +>>>>>>> next diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz Binary files differindex 59de64248d0a..34179d80d3e9 100644 --- a/app-emacs/Manifest.gz +++ b/app-emacs/Manifest.gz diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 2f6ea53e7b00..68011522cfe7 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest index d5bb0562fc44..443b32a312d7 100644 --- a/app-emulation/cri-tools/Manifest +++ b/app-emulation/cri-tools/Manifest @@ -1,9 +1,16 @@ DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f DIST cri-tools-1.16.0.tar.gz 6912563 BLAKE2B 09ceaf0ebccfdd39d7a325989447ca8c4c9e94ec0f20e8c26a5c9447d1ad6591df1c237abf130edbc84b4b1b65f81f109976d20195b3b34afca1aac460ad48e2 SHA512 c577328e11e975b15302b49082592f065be389b384cebbaa4615ef5c4ea81a4bfc88e02de6ef2749beff75ea6a27bb9d72b30af47d0f9870b297e9da53b3e25f +<<<<<<< HEAD +EBUILD cri-tools-1.13.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba +EBUILD cri-tools-1.14.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba +EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba +EBUILD cri-tools-1.16.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba +======= DIST cri-tools-1.16.1.tar.gz 6915584 BLAKE2B eb2bc397b3bbeadb64d4d13610189f18bbf49ff93be1b1f3edf504305ed1a2ca8e271d3c041f5af01117f6c7403671a29df30d7aaab270cdb7ab84ac921fa914 SHA512 df15e6f3c4fe697070547d804bfa6755f780b3f0562f06312f39d3ee8756931bbec7c07482e2ef73413d85c1e9ca58064a769a15b04b3832da17044d180e8b4c EBUILD cri-tools-1.14.0.ebuild 917 BLAKE2B dad3bb3fbf2e3bcb2580c323a7efa715aaf1ac143c1775ed6c724b07791c8a124b21c73ffad628dd93517d9ab1c446add7c40d948c9830a9249e26ceebdc9bc4 SHA512 6d5b4c2306e2f8e5bbe30f83186000a4ee98aad4de91d7c6907e3726cb5aa193ddf7d243355fe5920ec20a76996c0cf771a590f1a181d05d5a446f7a66a34149 EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba EBUILD cri-tools-1.16.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba EBUILD cri-tools-1.16.1.ebuild 1127 BLAKE2B affd783a11f2d267ab8f014ea323a2e14d651213fde9c8b7d2f8f27ea3daadf220aa7e9a25bb0aa407a1cbb4f534c3ec915020fefc4ff5e82e2e72bce14f2f59 SHA512 f1a99d8265fc5b5c445b9c79c7a7e3e76a7cfce8b05ec85478859859f281f941b9dc08a0b09514248717ff38471c2c8e98d2b93c3227145eedea3d940c94ee99 +>>>>>>> next MISC metadata.xml 345 BLAKE2B a0a36cc291e52c9625d8caf20d81a06d5a94d69987a912ff9b7cc50582b06df285544ba2e050deea23628c2de34ccec9cfbb7c9beeec486733b86e54d5f73081 SHA512 bb952b4fe9687fa36406793426a8f6c922db248d75794e4f17e31b4056b10e7ce17dddb5f47eb68045babfaa9e63005cc5d408f96d52eb7c67b78b034408e7d8 diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index e773fec163b0..85df92414089 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -14,7 +14,13 @@ AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13 DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2 +<<<<<<< HEAD +EBUILD qemu-4.0.0-r50.ebuild 24059 BLAKE2B 1b37f45dfc3f73f23fba024bed185f75df72f55ad8d68a273ce954eb01021a51ecffecc08ead6b92f015319861b3906ca1d54e731db8a81717d090828bc65570 SHA512 240b96516c7cea8f1b8d9be3d8a736e05384dd984b7d1f0973f71fd68337d2ae6955fa7e129c3b8c5cfce0c1cde1596b760412068694bc5835c124d199d2234d +EBUILD qemu-4.1.0.ebuild 24163 BLAKE2B 33a35941a60017acec0e4600504c3462d0aae79de320da812be097a9b2c3f4971c279a8ed8a5c38db4c83026cdc847b7f877d3d263791fc856746cded9153b81 SHA512 48686acbb7b97737e7851c53798afdc9601a521db4c719364d72de8915779abc1d9d0f06d129f69dd57e0fde2d362a278d0624bffce81e1f4bca6b3d69ab6b61 +EBUILD qemu-9999.ebuild 24066 BLAKE2B 391e815b990ae5bd97e24ff35f58c0abb818688d82785f0f6449ca32a170d5df84087d2b82db581318b23f1fe51a5db9865b31ecffdec64ec15bebd40873ba22 SHA512 7084f305e683c1a625704ba99f4d17abb188bb3090f83222d1bb8fc0e54c98fb3560331bf1ed7e769dab8a56811e658e0763e02754cdd11e3368abbe6b6959a7 +======= EBUILD qemu-4.0.0-r50.ebuild 24058 BLAKE2B 985a90476641bdadb888034f01bea1613060288caf18c9b33ef2d984bdb0b49e356670ab540b8f75517ef65000b019659ba85bc87951fc8e23472eb8ef7e05bd SHA512 de8bdc762becd2915a8f42b8a6b202d6a044a2c17d0116555dc7ff2b7288ef13766ac350b28a77dc8594a58fd67d75238d45b757630ce12edd224caa3bcbb575 EBUILD qemu-4.1.0.ebuild 24162 BLAKE2B 162a8478f4d3de04b20da363a4aa5a5731a7bb22a157e4695d252479ae287e89f757904d60b79ba136fee563163fff524c885e0ec4cfbdde6985613d2d81a832 SHA512 58784a1760c1879c3f152bedb07bca429de329a14a57bbcc8902d13e11d51affc303cf1add8e9e303c088e6c921a46411ed15d173b726181f43c32d7de7289e8 EBUILD qemu-9999.ebuild 24065 BLAKE2B ae91939955dc990470b479c41862e3f81a28472ec69bfa7ca62ddc15a9fe8dbefa3c344a0e022e1cd228dfaa2340a5dae039a190336f733dd260ef4e7045ca17 SHA512 70e7830e23bf0ba44486392653fd12ee4fe2cbf5ff1f545f989d42acd76340bc33505e6e2520139fda7131b828ce0c95fc5764f38b7949fb3ff6aa421a2db095 +>>>>>>> next MISC metadata.xml 4012 BLAKE2B 1777649cce22dce3bc047584df1ab428fb3216f126a175b727df0857de99f857b6f6a1465a39eedb81355a0348e11ae504f92d60d03b0ffddeb3529ac4854a85 SHA512 85a4126971ea026e21371a4eb1f2e6f0c194644902bd9cc64a066f161b353e4a39cdcdd51af8fc554e446c0b13817c3416cce9f6261d5d8ab93ba50d58eb6dab diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild index 8f9ef5bac97c..36cddd2c6991 100644 --- a/app-emulation/qemu/qemu-4.1.0.ebuild +++ b/app-emulation/qemu/qemu-4.1.0.ebuild @@ -684,7 +684,11 @@ src_install() { emake DESTDIR="${ED}" install # This might not exist if the test failed. #512010 +<<<<<<< HEAD + [[ -e check-report.html ]] && dohtml check-report.html +======= [[ -e check-report.html ]] && dodoc check-report.html +>>>>>>> next if use kernel_linux; then udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex 75fa3acd23c3..0da9c266ae79 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest index c20c3c4b92ce..a5a240ef47d1 100644 --- a/app-misc/tmux/Manifest +++ b/app-misc/tmux/Manifest @@ -8,6 +8,10 @@ EBUILD tmux-2.7-r1.ebuild 2117 BLAKE2B 8d4bb5506da4aafd44fdcee8c8397e247cdb1c966 EBUILD tmux-2.7.ebuild 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882b1bd86964ea6d4fd2753675c04ce0d81703338ff16da679add1df1e8abb3a7473e62d8897fbd245b79dd SHA512 d4dbe7723d81806f78d1d6e02edb851ce978189ad48242f7f765d19a13635bb0428d477ceb827af845b1d1fc18bbd7b446ece50d3853534f32d6526207dfe7cd EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367 EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b +<<<<<<< HEAD +EBUILD tmux-2.9a.ebuild 2333 BLAKE2B fda293b0602c650578d92e5065270abbffaab9d000102535cf6cb87d037c8e3e0413be21ca9549caf44f2ec99bfb4e0452ff486c14c40625cd3c3ee454b1c4fa SHA512 7dc539a60549466a9610ae9a4d7bbea39c15e2ec2f357c906fb67becfeb83f19c88088afd01463b08f87ac26e8f9d485d69f4474ab98c262c688c398883bcd6e +======= EBUILD tmux-2.9a.ebuild 2329 BLAKE2B 1ac85f5bead7092439982379dd11b67a238eed8b190ec0ebd8ad5a857a70d2e845102a8aa0ecad551557c0704eb3343ab494ea655ee2e9faf73184c8da0cf2ff SHA512 510677dd9dfdc8a12e642a52d13f88175067cadabdacda81eff66c7d126392cca84d579afdffd90c2ab99f6b50fc51fe39144cde34f00850db1f0f2695c2fbb1 +>>>>>>> next EBUILD tmux-9999.ebuild 2338 BLAKE2B b69396cad7f3e80f248ebcf1e25e96ae5d6f785aab57a8c8c3879ce3646cad3b4a1038631a9c94e5cff1379b7832832f45e4bd18e3d2fe87263c0323a90ddb9a SHA512 739f8a9ef385410fffd0fa9ec3fbb9c6277a37890e3f3cc2e3fa5e314b03d0303673d8778aa34546c08e12ea271b6fe83b763b3d8aa2835b860049c0df561698 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild index 7852a3a71405..4fa0176a67ac 100644 --- a/app-misc/tmux/tmux-2.9a.ebuild +++ b/app-misc/tmux/tmux-2.9a.ebuild @@ -14,7 +14,11 @@ if [[ "${PV}" == 9999 ]] ; then else SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz" [[ "${PV}" == *_rc* ]] || \ +<<<<<<< HEAD + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +======= KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +>>>>>>> next S="${WORKDIR}/${P/_/-}" fi diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz Binary files differindex 3b8db6cb516c..48daf6edb8ac 100644 --- a/app-office/Manifest.gz +++ b/app-office/Manifest.gz diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz Binary files differindex f567ada432a2..028927c389a6 100644 --- a/app-portage/Manifest.gz +++ b/app-portage/Manifest.gz diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 525de09ce1b4..d43f31d92679 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -7,6 +7,10 @@ DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9b EBUILD portage-utils-0.62.ebuild 2006 BLAKE2B c44402ebef59a344bfb3ed571a46b7a58dda17b3b1d231aee55c77d42a59c62ec5de69b595a67ca2dbadc568022f63385950964f0350303c65cecc5f541b36df SHA512 579f27018139dd0dda0781d7b9483ca4a467d069f6b0a8aa55a9786b8cd3fbfa78919b7fa6b85044f78bac6ad6ec896ec7bd990cb428d0dddf5bfeb1f2175272 EBUILD portage-utils-0.74-r1.ebuild 1140 BLAKE2B d58ad14ab2c7f786fc36147436e68ba29bdd100c912538cc2f28ff8a54be4c0556a87cafc512cd62c2b3be50c9ba784cf4b5dbe184929f3684b39d5df4e324f4 SHA512 84b221b821b7beedc52d15aefe9646e571c66f4086e89c4ac8cee7cc398b19428eb09000ca033f0eaadeb84222c468d002c76ed84070eb26a5e7200572679445 EBUILD portage-utils-0.74.ebuild 1073 BLAKE2B 813ec25c4030ad26b1b28294c268c0f3bbbe296488a811ecd2a8d87ea6bb7f1caaa9ecdee34f272e9cf5879cf3454506ad7a62be2d3e74b926cdd012e239be3a SHA512 fa9079a716b50a4caa61fba5225ec28a2fc4d8ea2c95cb8bc283434a7c96392fa9898537c6f98277860fe06a23fe02c255c17e54a2869e371235e094a99a8e4a +<<<<<<< HEAD +EBUILD portage-utils-0.80.ebuild 2265 BLAKE2B d8392092181c22beeba7c84c96c8673933daa0e45702bfbf7a59f17915c31bc2944b4c3325076d08d1808d56d2ef3a4865b14fae2045b8c5bcf0a52ef9a438fc SHA512 445d9762af65e0298ea202925233fd06ee8c1befec44523b241699150b661a931ebc3a435196fe839ba73ae0e7a4cc7372e49a6917308fd4e95c395035584682 +======= EBUILD portage-utils-0.80.ebuild 2261 BLAKE2B 59996f8647837f026aa76cb10a47f1dea99ed14d60caa7061ec4ac2efbee2a49d685ae55f30e97351275d3961ebef51a358409175e8d3aa477593b8f6704864b SHA512 f9887ad80dab3aa88837988ab46d41c3bf40723a9b95a603d50dd8870bf1267aac03aa344f4d056245a156a3793a771264bcff499c309ac76910feaad62dca7e +>>>>>>> next EBUILD portage-utils-9999.ebuild 1907 BLAKE2B 93409bc140a20ad03ae376ffe230545f6c8f393c0b18090bb2bee0746d3224f80295bb5a09afa06a1bac4742f6fa8d305cfa88b4dea29d7198016bf9466f672d SHA512 f3279b48dc6fb1071ebc6b062d5c0bfddef898af3fd21970c69e7aeb979207e84b6d9c24926bfa624d1bf8cfb86f467c02f9214e35d493a1649c9113e07c7aa5 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild index c733cba69bfe..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=" diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz Binary files differindex 907fa7d55b22..9f4ee225b0e4 100644 --- a/app-text/Manifest.gz +++ b/app-text/Manifest.gz diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz Binary files differindex 2a7e9544c1ee..a588fac90b41 100644 --- a/app-vim/Manifest.gz +++ b/app-vim/Manifest.gz diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz Binary files differindex a180cfa79b72..b79dedfef7d3 100644 --- a/dev-cpp/Manifest.gz +++ b/dev-cpp/Manifest.gz diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex 3b5626168868..67cfd3a2fad1 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 97e3a98e5983..7f85fde7b1d5 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -22,6 +22,10 @@ EBUILD mongodb-3.6.13.ebuild 4230 BLAKE2B b2d7e960c5d6a4dc9e4f882d999446eb9ab4e8 EBUILD mongodb-3.6.14.ebuild 4231 BLAKE2B d285158017e7495ab091797ff655f86f192558eeb483863fa2307f4da26299b093ac1329c9a80560a2921134e573e1f23c249240c88e15ccb818e6bcf6433e53 SHA512 372a006e05788a405e9aae7363d12d4019974a2957be9f1c730fa10d93d1eb4374c01c252f3d286a76917f3e9fc3e7058ad33f586523fe9f7e96150ea5a8d4a8 EBUILD mongodb-3.6.8.ebuild 4197 BLAKE2B d28a62156019eaeab2d0fa8b4de5c5589e96c955145f283d810ba58c906d01e6447d74b08fc8037e2ebfff9b43dea38c3f6d5b28615e322ebee892bbe9c97d3a SHA512 90c2f9937355bed8d110044a89a7a5a3980c236b0e33b67457c3bc3ffce2ba3dc730dd55b977667cdd43ff07ecec4489183cee50e8e0e2a618ee2ec3e4fe82ef EBUILD mongodb-4.0.10.ebuild 4231 BLAKE2B 981c770cdbde22763fa8f4c7be235de7e8d312b1a1b1b6e688de557201cd0c265405b4bd8e5415d9e845618abdd0156bb594036376185ec57caa02cbe7b7ef56 SHA512 9e8153cd872408325dd0941f7e2fdffef09e6b1bd24dd8cf297821fdeb94098c1096df1a722db8e282db18a3bff0f95ce672cc3a3243801cbe3408135094c91a +<<<<<<< HEAD +EBUILD mongodb-4.0.12.ebuild 4292 BLAKE2B 083dfd2200179cecda627ea545d4d0e5c7f26b7f0c5f4c0bfaf030d666b4cb1ee476056ab494b7e1dbf3678848e8a68f58a00d618f16b1d511954f028bf6bf8c SHA512 76d5a91f4530754698084c273115cdd7932edd0c8045148bd575c9d03cf73f8aa70ad28e4b0e826232cab37637d8af9353f7ff13e6cfe0f8beea43d6951a7ed5 +======= EBUILD mongodb-4.0.12.ebuild 4291 BLAKE2B dedfea39b0454fd1d4c13fe96c032845d8c951f75bcb6bc85bac84fbd1d6577e415cf817fddf5a6fab50e958b01dbdb467bcb1d33f4a3f1652efee2eacf745c3 SHA512 d0ec6aa07bb7a46b54ce43e4dccb599149e6e67dea4ecd7a85ff7332d515b802e7cf14f5dfc384e1c37820d9503913082bb0699bee37f6ab5308b12c8c26c5af +>>>>>>> next EBUILD mongodb-4.2.0-r2.ebuild 4333 BLAKE2B 0ec1ff9596f0840de62c4ef6844aa0f38fd01a4f0de1c9a9545bb9de991482fae3ee398f3cec39367457c92758f442414986914354dbe8cd8d5bf3b34b37ccbd SHA512 01f7426d86a90f3e52b0310c260ce738b77c31baf01f3634734e41c978fa0123946c269834e12af93f4fe748d3019782d234a30c7a327a3814c3f7ef63d42a5d MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36 diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest index a44bf2cc2a8a..4a1be6a42b56 100644 --- a/dev-db/postgresql/Manifest +++ b/dev-db/postgresql/Manifest @@ -13,8 +13,13 @@ DIST postgresql-10.10.tar.bz2 19012049 BLAKE2B 44ed5cfe2dc57ff3533faa1e921c981e0 DIST postgresql-10.9.tar.bz2 18981395 BLAKE2B ef2ac003b393ea7cbf24c45fac6b3dc69df2a8694a9e891d5a68f7310d63fb816649d16a7351d03b63a4eb2256703efcab616a0146324478335267c39f3b9829 SHA512 4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e DIST postgresql-11.4.tar.bz2 19759635 BLAKE2B a3f35df40d31dce52073eeacf4e16bc7ccb487dc0a6e15b84d087f04fd130b66b1168ece3edc63927c377ca1044b54ccb3db5fb9b4a5c86a5b0e179a6678c73c SHA512 159fb84134e05ddc58e40a879ca52ed4d58ced7bcd1e7310d59bda84f9055339a31a92cfaab2c063a88685f7417b9a828534394bf9a2477fc33d1fb6cd26186b DIST postgresql-11.5.tar.bz2 19773087 BLAKE2B 32dca67ddfe2f6a6801a5d82a25fe7df0cc2dd89c35eee87a57ebe6391b8d7d4bccc59d6cac3e821ad76731ab319e3303f2fcbce9ee8cda1cfef13b2185c0ab1 SHA512 537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141 +<<<<<<< HEAD +DIST postgresql-12beta3.tar.bz2 20698785 BLAKE2B 438ed0345730bd94478f73d4f1481b0a184aab8fd04c7097e41913d0648587e728e219f88f6ed37409acd41b3cef9a92b0c3c5de421cf845f643bd7c5f8288bc SHA512 c437fa0292ec770b0ad4f8c99ab9d0824a33aa1e4e609904b22cbfe0412ea7e54671fd08657d191932231a637d2356e76eaa2f690c6a9e3cf2e68006df04b299 +DIST postgresql-12beta4.tar.bz2 20710205 BLAKE2B 7a1a1732c4fe36aeadb3e80b4cc85796a3799ffe815f5199d8528668bd9588cf1edbd55a56c499bbff68e7dca01b734be6f50db3143cad3cd679dece6bfd9719 SHA512 52bf2fca13ea52890e5f6c6d42bfe8724267a3bb0c703cf792cab67cb7d71794107ec68a54e1b7cdc88d5050aa0745ad4980336074b04dcc610967b70776503b +======= DIST postgresql-12beta4.tar.bz2 20710205 BLAKE2B 7a1a1732c4fe36aeadb3e80b4cc85796a3799ffe815f5199d8528668bd9588cf1edbd55a56c499bbff68e7dca01b734be6f50db3143cad3cd679dece6bfd9719 SHA512 52bf2fca13ea52890e5f6c6d42bfe8724267a3bb0c703cf792cab67cb7d71794107ec68a54e1b7cdc88d5050aa0745ad4980336074b04dcc610967b70776503b DIST postgresql-12rc1.tar.bz2 20718193 BLAKE2B 4c40c7ab6e98e43da4073d0b7b8341f47b61326ab4b552fe2e075a5135ba22b6b82a1fcd0aee80863e9cfd3cdb659bd609832e44618feadde4329dbc669ccecc SHA512 bea1fbf40836597f2427a5d3de4f9b5732a795b755aaa3263205210b8b27aab0a7a860e73c4698de77cd4f95b685390ad96732f5e71e35839df2ca317f75badd +>>>>>>> next DIST postgresql-9.4.22.tar.bz2 16848787 BLAKE2B 5c2aaef13ef0cf33c421e6839877a8e4e1fc5dbe41d9cabefddd369925869f92f6c6b8a124b5778f9b25359103f0a7ada1eddcaf4bac498709f563928f25e7e3 SHA512 f11623a89b2320616fd53eda52da544bdfcb63bff08cb78fccde134ef628eee7ee90b3de6952f4e08c10297d356624faabf0e5b181b0105f51797796cd04efef DIST postgresql-9.4.23.tar.bz2 16848808 BLAKE2B fd747fb3f6f540190ecbd53116ef7b8b812d05f5968e32c9d09c5902239eaf073281262dba9836514344303a3c894f48c617e050ce713be7c09f53ee49c7b3cd SHA512 b1eb392b939ac8369c76e4ecc142c78f380afc498b60ec0ea97acb16c21ffa5c11a24c2c46463032865955b7c531492c08feb6ef1efc46a549369f026594ea61 DIST postgresql-9.4.24.tar.bz2 16842941 BLAKE2B 999a33addd493d1169ba3222a269fea827f4ed866453727bf9545d6a8873943d56b8e71773daf0f116150dc557afaf2e80dc570e8f351ba64b196ae8bcd8fbc9 SHA512 8e7b4da8a5cf48cf4d98cce117614f7ab594087d0002f996c1fedc2a38af6eaa663ad3ce67ced6d6b0fd6d0b00aee932025bf50a4314933ba535716577e9393f @@ -24,6 +29,26 @@ DIST postgresql-9.5.19.tar.bz2 17571998 BLAKE2B 24bd617ecef4d0add443d20ea3528eb8 DIST postgresql-9.6.13.tar.bz2 18767279 BLAKE2B c1ec780a7f938f878425cbd6556145e60a613135129daaacc52e9a699cc448a22481b01fac20d0c09373ea6a026f39bc58234aae4f1126333b94f621981a8135 SHA512 65cc70410ad4a1a738b92855b92eecdbb9efbbca0eb9a45a138d47b696c8f9c9cd19073fbfdf5c80eea7633d0be29b4ed8acbadd38724acf8f18c90bb30f9b26 DIST postgresql-9.6.14.tar.bz2 18787744 BLAKE2B be5a0d90fe1cd5ea682d8446e512271175f705bc49514215535d7aa4b631669846c0bd6167f985028c07dc5d6d394a1ea809028c5a5e15a5f010e85c2bede8cf SHA512 dccc183a6992ef4ece4ef5c638339708ab484e571ecd66ed993c9071cd55f250b4277fd3367f9a5ee545aa83e29dc5f7a239200e200e3314d5acc847f35e790c DIST postgresql-9.6.15.tar.bz2 18799121 BLAKE2B 5dee0fac7592cecf4412deaef54cedbd86eb6081fc268b6ef8a5f01c31af930747749fb54a77d766e1d6ef705bab5d550a7bace25c86d201f25ed69163d920fc SHA512 cc35a059bf59ea3487c17a8432b791ca2a19afaa24b07403a8d33904b3a97ebe601e3036ca8ec766c54cb87a7def7d4618a425a4446e6832391185d7c71117db +<<<<<<< HEAD +EBUILD postgresql-10.10.ebuild 13936 BLAKE2B f5e02688e7d569e8905f3501b8d2d6842130dbea5becad4e6cd073b7785f20c8ac26b0fc91ef3ceac5d480c4774ed1002124d0e44a881e994b6f494181330c3e SHA512 39ef59111f296500dac0f5ce88cdf8e51d446e11256ab6a6be01657935b7285159447e368a32fb05c60c6d67ac65674da1ceeb432ad645b0a3d8406b3d34d309 +EBUILD postgresql-10.9.ebuild 13928 BLAKE2B e9df06af21c478279778b92d268ae532dc8b4c477027eeac9a67c6047b2c823291bd4c32749ac651ce6f5f6f044fc47411fa6d0a40fe4b137237035db0d87f86 SHA512 0148c7289460c0a6e88bc9e64df5a44baba55fb8e3795ddfd3d9d2e0299a963e6bbdd42a9813636e783b84be33e40ae409d945ef360a638b775e9ab806577c4b +EBUILD postgresql-11.4.ebuild 14054 BLAKE2B 2e346a9b6996c82e4e0b091a7f466fb25d9b4f2fb6612056767c2104dec8a085f2f59a26f913f9d4d9e67717e79e572c5f6f883f4b7f2a8af7d6aa7250212ad3 SHA512 081a24ff08b3f48a7f494385acfe5a24f6fa3eaee4c13054c9d64912787d65d06b138003dddb70debb9c436de99961993a0999695ddc5d101730fb0c6d4f2fa0 +EBUILD postgresql-11.5.ebuild 14063 BLAKE2B a69f06a1568db9dab996ced9b678c73f45d93225ccda020748e1cd982369cf65b9df5a112a0e15cdbce03fdbc4e5e72b1f76c86f0112259eef79c8a57fea1201 SHA512 2e1cb50782816e9aa9acf4ee2fbc9e4e9b1ebbd56b1cb66301ab27766be200ab76d185c1e074108cf96465dd346ede4559a0b0606c68d5d2fcaa96addc921352 +EBUILD postgresql-12_beta3.ebuild 14038 BLAKE2B 51e7197cc718e5bd5e41399a4900eea5fc78b1cb72e7af8aee0b16f574dd482de430c357cce0b5c1cdf81b3eb082707de4e2200c2c7be8b8a8b842199ce2de9f SHA512 80e15aa3ed10c4529f789ab84792e5b9df7597757f4a4b29fe029b5414df230358c314daa435535dcf18295db1ecf03b663eb008f62fd4f3c97fa7e3539c69a9 +EBUILD postgresql-12_beta4.ebuild 14039 BLAKE2B 27e750043693c2dd3436bbe5b65379bbc5a0ce0f868366ca805f3f62d00852fb6ec3df59565b008d6b73ef1a99d9e18dc0dca7be958ef889b55f392fe8915ce3 SHA512 95afd446c30ea3ffdc719dbe117ea502bd08569d607b6e7c0b893051e85f997cd5dcd9d82b287c3302c4c643e27a7d3e01b6401bc43d5aabae6e1f3a4ee88f81 +EBUILD postgresql-9.4.22-r1.ebuild 14532 BLAKE2B 93742f760ff30542947bb3d9ad51108b545152dce34a4082a0c90c57a0d18612c98b07ffae9ba40ec46741eeb561f7ff80ba344dc2fb9e1fb373c496f5e0e74e SHA512 94c63fba357b837d877d60bc0b6fba33af18de0fda8bda7a39ecfe47490ef4e4d93c4111c3e647b978e3af7dcb53974144f38ce8ce1ad5da88c00aa67fd8e912 +EBUILD postgresql-9.4.22.ebuild 14368 BLAKE2B 2c6b46d98d0cb9f9b4e2063d86b7b1b353c3edffc5386c3f1225dde7430633e539714d98b8ec179b13a612dbbd2cb8a32b2aa321a4cf60e74e64c6b793a1a711 SHA512 6de69907fce6835510de53a961d54cc2dc7e0464d48115c29195d3384ba7447ba472d6b89946545c02b4f42cc2e778f4dbdee75728d212ffc651f75076f59ceb +EBUILD postgresql-9.4.23.ebuild 14523 BLAKE2B de5ed60cc93035f587f94ab1e7ae7b28be094019b5a38760a5584f72d31c15d34c939bac1c0d7cdfc2e5ba054dc869ecf6a1f3130df333655e422d9413cb3594 SHA512 499a9fa0b07bc31ed8e8db0f42e00ca8af6ffcf3ec437b2e518eeac8fe1f74f343db084032b7ce2802c3bf1f4db1aec1eb6b9d92f9183d15610c97ed48521350 +EBUILD postgresql-9.4.24.ebuild 14532 BLAKE2B 93742f760ff30542947bb3d9ad51108b545152dce34a4082a0c90c57a0d18612c98b07ffae9ba40ec46741eeb561f7ff80ba344dc2fb9e1fb373c496f5e0e74e SHA512 94c63fba357b837d877d60bc0b6fba33af18de0fda8bda7a39ecfe47490ef4e4d93c4111c3e647b978e3af7dcb53974144f38ce8ce1ad5da88c00aa67fd8e912 +EBUILD postgresql-9.5.17-r1.ebuild 14760 BLAKE2B 14562ac30db311132b4317c548d92c3d0006a19174e9b33a9a01099ddbb0e6d6389478fe021828c0a733141e1442098a848a11180ec3a3a2bc17baa032e24db6 SHA512 b14450932342e323cfcca615a165f4a4c83cd34b047edc70ca201d9460fee0c6603f0980fcdf736a0db86bdf5c75f0cfc39ef9c8956edb69e3671c399b8556e1 +EBUILD postgresql-9.5.17.ebuild 14596 BLAKE2B f12b4c612d4360b93f363fdd0a7eda9285db0122a7e663bd7bec8222289e2a2da0bfdaaff9ed2398a154976cf1f13cd9e2e717b23accc7e528f76565942a5976 SHA512 9e9a7aa496a65e036d1fd4528cbfb06f5014059dd96b581ebee38f3a3e65faefad222cb5f2e54dc95b640a89f362275ce0f3d942a092ceeef50973f2937686fa +EBUILD postgresql-9.5.18.ebuild 14751 BLAKE2B fd1d57d82a4d4d76ab34b5c7d36f5592a8b5d3c43fe2de8eca65e975be5829b023b7f91772fe4480f54af8ac4f3df173820bdc822e917e170755abb5c7a374f0 SHA512 86302a8ce3d00466d206154b5cc2e43d828c3e36dac2574eaa4f71e645dd55eddb299cd25b31a1f602caf3219b5d3a66f7ec713ae2e78d5a5cca386864757580 +EBUILD postgresql-9.5.19.ebuild 14760 BLAKE2B 14562ac30db311132b4317c548d92c3d0006a19174e9b33a9a01099ddbb0e6d6389478fe021828c0a733141e1442098a848a11180ec3a3a2bc17baa032e24db6 SHA512 b14450932342e323cfcca615a165f4a4c83cd34b047edc70ca201d9460fee0c6603f0980fcdf736a0db86bdf5c75f0cfc39ef9c8956edb69e3671c399b8556e1 +EBUILD postgresql-9.6.13-r1.ebuild 14993 BLAKE2B e62949c713914f8fd68fab5e70c66695c092c8c28b9d6c51a9e853c294281a017c15541e4fe1c879a2bd4997b7ae4a2cdc233fa55ab735ae27049bca3ead1113 SHA512 f3d6093665243f2c95f89bc20d84275c16d194eb7d5108fce5d4f8ba72b4224bf5ef43d6157db4489198bda6c3b9c401e51768877618521f1029c13ecbe0d24f +EBUILD postgresql-9.6.13.ebuild 14829 BLAKE2B fffb2f1e956b93a561d289f657cf678f4e414e21787c73d1ebddf7182aba7b8374307e878841edb25de82feb866f88d79b89ed115bb4d916b8ed929c1a30b5d1 SHA512 c8c70732f1390285906e45cbce8afa3e3435814210c53e092bc0c2fa9f0ebe8d86b3f782e6eaed989a4c2a9a766a158232623e203e2d4917cfa95a05ab88d213 +EBUILD postgresql-9.6.14.ebuild 14984 BLAKE2B 08316d3f38924aea07f8dee69a823eb82277c0e15332c243de2218419155bde7103c062d644d38f08615b9035c244aabccd9b7df719c11bcc48bd64270047c34 SHA512 2f6e0e0aeb148e8e3e6fccf7f913ad902ff27aaac97cec43024b5e6fd8799ae77832d7aa7d312a08baaef1621f1ab4aaa29ac3fb2e4af8ef74c063112a72eba6 +EBUILD postgresql-9.6.15.ebuild 14993 BLAKE2B e62949c713914f8fd68fab5e70c66695c092c8c28b9d6c51a9e853c294281a017c15541e4fe1c879a2bd4997b7ae4a2cdc233fa55ab735ae27049bca3ead1113 SHA512 f3d6093665243f2c95f89bc20d84275c16d194eb7d5108fce5d4f8ba72b4224bf5ef43d6157db4489198bda6c3b9c401e51768877618521f1029c13ecbe0d24f +======= EBUILD postgresql-10.10.ebuild 13947 BLAKE2B 352dda96771363d7dde12febdd215eb61afc11a697f6944b62bf3eea87c6447f21847afa3938987c2c7d1b20bac57e02d8b3def58b1d180bcfabba1e8f1ea796 SHA512 5fc97c1b23e7a08d8711c4b6ce1a707f525dddc24fec964421618862a34c240ab6178913fcb9fa8f5bec2583daf0bbdd26a088a664b2f43c48e9781520eeae54 EBUILD postgresql-10.9.ebuild 13939 BLAKE2B 78b7297728faa00aa428f5cb3f7e9c83ea19775ca745245430938620d20c831d2f51013e26100ebba6db9b562967cb1f1a8a508b92a7cc756650cfc251c4d305 SHA512 12effc38127b99f1207124fbf9ff57828a76fd90837d22ed26bcf68fc1ce9a6a5e8e8a4788326e38a14c331bbfc37c72f74090e1d24478e8181c838b417a3514 EBUILD postgresql-11.4.ebuild 14065 BLAKE2B 6200e64e83b140ab7bc589f892bfe173b8f78150d2a303cc0c404edce094fdb6bd2c754e7a1366aa72837335156a335a71ef71c1313f5c479947ec3e3ff4f370 SHA512 0f3e334f519ce5baba89d0da36365c48d99ca71b694dc4ef211195092d96ca89152ead4bc274671912e608b94b716bd49a53ed7a5deaf455c46dc6674025a398 @@ -42,5 +67,6 @@ EBUILD postgresql-9.6.13-r1.ebuild 15004 BLAKE2B 4feeaa04209151ba5a86687710737ee EBUILD postgresql-9.6.13.ebuild 14840 BLAKE2B 2e29f79cf8160f6eba190d0ab6b7aa9506dae41e5aa6b64cf1b3a26d0645a23ce5ee66e37a1b9c360b0b191726fc22d251e8172d21faf429a6377d16a26b9f98 SHA512 bec8a9a610dbf0a17a8ee3fcb7dc3c1eebb1d69f1acf0d34899409538824d3b3d14254c38efd8f331bb5f981c5aad6bad74a29ce17b27bfd09d33320bbfbc07c EBUILD postgresql-9.6.14.ebuild 14995 BLAKE2B f552296e01e087c9d6dff82b46c26cb172c8208d9e053b7fa9eb418d9e39ceb267a076d4181adf8f473c6c6591741c88347227ea02fbaf580e2afa908331c73e SHA512 24178fabba811c351d1fcb88c96a0bf112d8be1bc819cdc6abaf562260e400c43baade9a289a67bcff7a38cd345bdfad1aff13c610c1fe9ea98a1c121be0fa12 EBUILD postgresql-9.6.15.ebuild 15004 BLAKE2B 4feeaa04209151ba5a86687710737eefb1fbf195e89174dc30f4546f8007d1768ce2793579a17989c47fcf10403800dfb11ea021ec9eda5939cb45048eaec8d7 SHA512 305f6fd0a55f316c358afc41a85a566e52ce8befeccec039e4569366da1cd850d2d8ac322819af05d493dccdfa395f9c64442f0bdec8e3e139b6b19126b234d0 +>>>>>>> next EBUILD postgresql-9999.ebuild 14485 BLAKE2B 386379214652708fc23727970999371b77804bd9a0a13dcbdcd94e6f8a0d5b30b3657063884177a0f903f88845f2fd202bf6b05e1fb51fd82c6aa5bdc3d290e2 SHA512 4173d20a00da315d9bb15a32474f202edfb0580494fd37501e8a9c5f61ae334421ad092da408783690557621ca95455baa7d5e22436973c723c5de6f9d79e286 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0 diff --git a/dev-db/postgresql/postgresql-12_beta4.ebuild b/dev-db/postgresql/postgresql-12_beta4.ebuild index 9fb7fd274e00..5b3d4e8e26c4 100644 --- a/dev-db/postgresql/postgresql-12_beta4.ebuild +++ b/dev-db/postgresql/postgresql-12_beta4.ebuild @@ -18,7 +18,7 @@ SLOT=$(ver_cut 1) MY_PV=${PV/_/} S="${WORKDIR}/${PN}-${MY_PV}" -SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" +SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" LICENSE="POSTGRESQL GPL-2" DESCRIPTION="PostgreSQL RDBMS" diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz Binary files differindex 9e6d6858f093..c88ca31a7324 100644 --- a/dev-embedded/Manifest.gz +++ b/dev-embedded/Manifest.gz diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz Binary files differindex 56b912ef8bc4..1b14bde0faa8 100644 --- a/dev-haskell/Manifest.gz +++ b/dev-haskell/Manifest.gz diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex ab1e7990a229..c39758f413a9 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex 7f0c3e3a60bb..02d8e7055e50 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index eb933fa4d26d..3dd4ec0c13b4 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -9,13 +9,20 @@ DIST go-linux-ppc64-bootstrap-1.8.tbz 52315782 BLAKE2B 6be0a48e8bc4e5fed4d34f8aa DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8360e904c2545380513afd328077c584e8af0bf6bd818aa03e5a58c350cbb98facc1c9dccb02b06adcb27233875497cf5d33265912 SHA512 6931d999dd0ee1ff44c4cec48acb27af061f57f87aa74802dcebab78553b46bc8ac732f07fe91e5074dbdd32c55b707994875934bfb12bb4276d71eb1d06c4ba DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d +<<<<<<< HEAD +======= DIST go1.12.10.src.tar.gz 21980044 BLAKE2B 95ebf0a6f04d055e5e9d6f8e2a13835aaf33c4f7113772f7a70af218f4e929a047fc12b0ef9e93a9156877f61361219da16bb2830799247b8200a7648c562abc SHA512 9d40cf8d71daffe43f5872597b316cd1150ae640d852ff0f0be3126cc7bb40b9a0290bb02d7fabdf808f40ab3f67a56d2eaeba3b32299fa9b0a3df03899f6ac2 +>>>>>>> next DIST go1.12.9.src.tar.gz 21979950 BLAKE2B dca7e3afcabd513c4b8193e93c0a1ed1a2326dccfce9b909d97b3731fffbe7e26712ab164645e06a316baa949b1e0b14a2fea8d23e6f90fd5b72afa0d15b432b SHA512 57041e7fb767f528aa9fc2592d205d3a7c120c73f92dc8d91f17f816e12aa6152c8421b333081800a5f50b1bb656f203a25faf8ed92c69a6ec164ce0a5619c13 DIST go1.13.1.src.tar.gz 21622361 BLAKE2B 08a836d3bd57befed8cd07c4d6faaf9d926629b06e5fe97d1fe364df8b2368310b31b04019fbd0803caf7f52c8927122ba1638c3c26b6fb38c9236ff96eb06d7 SHA512 696fc735271bd76ae59c5015c8efa52121243257f4ffcc1460fd79cf9a5e167db0b30d04137ec71a8789742673c2288bd62d55b546c2d2b2a05e8b3669af8616 DIST go1.13.src.tar.gz 21621948 BLAKE2B dff6024287c0805ec735cb40aef4ffd872bdc17df6e0d531be3d16806292edde2a63299fe7b9b3c97a79f6f864ab0f95962a0cd2e1a0ba0216b3f4bc59bf4bcf SHA512 c6346b1ab256cb743dd98625d8b16cdcc1365b186e039e99747d6c18041045daa065f6bdce17cca0a9800be2dbb34e90adf5518d5295693f80435c02fe5b2cd8 +<<<<<<< HEAD +EBUILD go-1.12.9.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26 +======= EBUILD go-1.12.10.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f EBUILD go-1.12.9.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26 EBUILD go-1.13.1.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f +>>>>>>> next EBUILD go-1.13.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f EBUILD go-9999.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 2e6e9369f6fb..f2b824cbd602 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest index ae58822175df..03cf92de0495 100644 --- a/dev-libs/aws-c-event-stream/Manifest +++ b/dev-libs/aws-c-event-stream/Manifest @@ -1,4 +1,8 @@ AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9 +<<<<<<< HEAD +EBUILD aws-c-event-stream-0.1.3.ebuild 622 BLAKE2B 4c109ef9a79998f5d8e56402b6fd1ecc67cef7a724b64c4e1c0964d0757737afc85043e53d28a08a8ce5b7568cb835e2edd695763859659ef76f74f885486ec9 SHA512 561e3d02bf6799f095c3d21d52e58a42ad7b4c53fe4717b39da1839d78a37efee491596d3382150ad0c55e4325c99e220e09ac6f8c86e6aa731198ea73b7d49e +======= EBUILD aws-c-event-stream-0.1.3.ebuild 649 BLAKE2B 6180176ac83ab02e6ae800686b8445b2439ed8499b95eb68fbfa8ca876f5423f57fb90da039810fe3a2a16be00a006a8ecdc6a387d4e29ca0327dcf96ebef796 SHA512 c54ba3465d9220d7f163e7c3140426f38e2583b558d45b6669661c350c0610aa2af5d45bbcdfa67fd4e78a653067555ebbf9662cc897f9c6b827d0e267394c95 +>>>>>>> next MISC metadata.xml 360 BLAKE2B c3adf10e8868a7699a1c7798e4221cff255e9505062692d7db7b733e9d5cf7b568183a294c9e0e7b125e9a6c0d848d370a43ed6cd32e498eab4adfe1c46e7abb SHA512 571bbdb2968c5b6f49dcf41e7706775f2bab9302eef8795f9ccbd51922436161af01b17857370bc49960cb1f40a670ca759ff76381e92f7cd18ee51b9361f10e diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild index b45aa6f30db9..dd367d2e10ac 100644 --- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild +++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild @@ -15,10 +15,14 @@ KEYWORDS="~amd64 ~x86" IUSE="test" +<<<<<<< HEAD +DEPEND="dev-libs/aws-c-common" +======= DEPEND=" dev-libs/aws-c-common dev-libs/aws-checksums " +>>>>>>> next PATCHES=( "${FILESDIR}"/${PV}-add_missing_cmake_install_prefix.patch diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index fa8aa782fb12..09c3fe5ed709 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,5 +1,10 @@ DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734 DIST efl-1.22.5.tar.xz 71358856 BLAKE2B d1b9c8263608bca61760adb129eb5ad3d507caaa2d4e03847d9c06c99494d6dcaa0756368f700fde64d15dd33147a1f58f5391164902c1f9f586ef7307b14510 SHA512 87d10ab244778fc8452ea85cbf698a6b0ccd065964941f7c04d073cf7db9632b09d7956d86bd5c4e9fa102efceb1057269322e84504c70ee5f740176cd4bb26f +<<<<<<< HEAD +EBUILD efl-1.22.2.ebuild 6877 BLAKE2B 5569c1e68c66b5bf103f71e526eadd1ea58ead7e37d2cfa367a557bbfbfa3e0764a81338ee8f046a988984540c0a875b79097f62661fe567dfea7df7fb723cb6 SHA512 c1bb384fc318c85a7cefe6cd68c0f776f7319ff80c98389907e373f1880c00c1ce1f50befe097c207c227da87978e19c5031b590e0773ea395395f7c5a271369 +EBUILD efl-1.22.5.ebuild 6879 BLAKE2B 7d51377cfb1356054b7ab9562d77d8310591625b2af614e4cd99067eafa8f170cfb2fd66fca2e311bdc4f688aa48b61b15b7f65591810b8510d5e83797ab8bf1 SHA512 e8ce2178fd494b7e701e4e56d70573439db2ff1a6eddbbaf89b111a6b3388af49bf98367563a0c131c55a46c6df4bc982dd4582caf1110d8117ddfd35aa55d3f +======= EBUILD efl-1.22.2.ebuild 6917 BLAKE2B e72f02cdd98c2b951dc29df62c53d2b4d964466a7e77e0612503649c2176bfb7c462e4f9442ad71337b008e143e04e199401573996b06dce37e26ac3640834b5 SHA512 85f8cf01985e23021383937b402097f9f4c2439398c3b4bab96ef031a620bdc8af54e2f3bc8bb87dda1e94b204a5f48c6d6738d73c5238e718bb1ee82e20b172 EBUILD efl-1.22.5.ebuild 6919 BLAKE2B 3395a373c722c55f3ee8cb0c9a04b2433e158c60cd864a58767f5755a4134dd053cd0f5e0b5c26f666e06b53482aa6ff91ef4521505b8caa7f0d8a591e8c0fd2 SHA512 aeb44bfa0c2c7ac110cff54f4f462fe8f1bf7d20fa35ae1a6a9526cd18d541574f2fe3a5667f4f4bba6080e713afec15afea817fa7fdecac2cea5e996652b759 +>>>>>>> next MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4 diff --git a/dev-libs/efl/efl-1.22.5.ebuild b/dev-libs/efl/efl-1.22.5.ebuild index 5af4a6a9437b..2da0160a9808 100644 --- a/dev-libs/efl/efl-1.22.5.ebuild +++ b/dev-libs/efl/efl-1.22.5.ebuild @@ -121,7 +121,6 @@ RDEPEND=" x11-libs/libXrender virtual/opengl ) - wayland? ( x11-libs/libxkbcommon[X] ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest index 77f068c49612..8583c829f980 100644 --- a/dev-libs/expat/Manifest +++ b/dev-libs/expat/Manifest @@ -3,5 +3,9 @@ DIST expat-2.2.7.tar.xz 424264 BLAKE2B acf2fa5cf374a671603f4a12b81239ba3b1634bab DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9 EBUILD expat-2.2.6.ebuild 2496 BLAKE2B 62a7621cad6cd7f5fab49320a6ad0221a5813495378da71e56c745f773b8aae512e1c6c543ac732ae1305a52c8330cbc68aea6b1284c40597fd9d7b58ae96911 SHA512 e72be5b7ef4176b6717858b7a0fee719cf924baa4c320c68425270e0d827bc9ef3d5bea5b466a8a01c854ea347e7b11e69b4216d28ed2b70f69db57921d316dd EBUILD expat-2.2.7.ebuild 2514 BLAKE2B 5e143de91fff2676a2162b1da379bb0f2931e5d16558cb0799af7cd171e6459bedf5865c12e318b3f50a9f65486e6a1d907c20c72f6247cc21869e92dea46ec7 SHA512 c80e08e274a162b0b220dc099c50ee6aadfb4b183f941cfe1787bd2d8fa2b0c06ef11ad469c5b8076c46bab20f671a906490a542c397f3681919b8887cc14b4e +<<<<<<< HEAD +EBUILD expat-2.2.8.ebuild 2534 BLAKE2B 381e377ccd7bc672c0ec6047021530e88a87f4aa6eec39b32fc2287f85c4988b37f85149ca18b3b870b0800e1f147e796c10b077a18380d0c5535a89afb957f9 SHA512 410b5404dc17d7908f1026cff5bd189be35d926bcb6d0dda16c0e7f82a747ac53d714e293b58dd1abb44c8cb0ab1d55277fdd3afde23439ddf543539b15f90e6 +======= EBUILD expat-2.2.8.ebuild 2533 BLAKE2B 8d333d67242445f8f7646a0f3dd3d5cfb416fb8a49fe7c950bcfe6e2e05f6a0c92f474c44c1f0e245efa89cac19d5bac372a2523adf50fcb1fa189887107b4dc SHA512 25b73400be33b37c86544a11dab59e5cacb692a2b36d1c07d4f47008ea758b7e8f6d3826e90468517c6cd20a6d3b925cf00d2691a3cc829faa5c8f3c940cb5df +>>>>>>> next MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3 diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild index ec0b4ffe159e..beab95c6e5e3 100644 --- a/dev-libs/expat/expat-2.2.8.ebuild +++ b/dev-libs/expat/expat-2.2.8.ebuild @@ -11,7 +11,11 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" +<<<<<<< HEAD +KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +======= KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +>>>>>>> next IUSE="elibc_FreeBSD examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index 9a2dcf911dfd..430dace65eb6 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -14,5 +14,9 @@ EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189 EBUILD libffi-3.2.1-r3.ebuild 2380 BLAKE2B bfad9eae814e06536a2d6bedc8d746fb57d0746a4324fe6ed6474c7cec772b0b5e52cab4889a022489cbb3dc3a6dc368086462f8cde048ad0abfe102d2a05021 SHA512 03f7403c11b9b5395ff6ca0b57639a5c5a897372af9e9e638dd8d902dc35afdb5bb4615cc8408820853e79097d9350ea6794cfdd809e219418a4f675c2df4707 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7 +<<<<<<< HEAD +EBUILD libffi-3.3_rc0.ebuild 2108 BLAKE2B a56dfde1ab20a6e7c327db771abb78ccd67d43710b3cc347ce0fe42fbbb1cd2d014cefac6afe8a29894111f819c639907d7388c025072af3b563e7d4ae53d410 SHA512 23cf7b84ee253a8e86125f51f6ee6ab2c63c9120526a139b486f665a50cdacc9c674a3894972278835ff63b2a522d58b156d594aeecea645241501c089fbecca +======= EBUILD libffi-3.3_rc0.ebuild 2106 BLAKE2B 116e6e9d949b4103862727966ec48a18c002e3b676803cd99f4c3776915f520cfa1ed07903b5a039a497afbec90bdd6b580b028c95c0bdc2a64b9fa361a8b500 SHA512 8d88a86081c88caa9fd938560a84c2d29c27155be261517c0dc0e787d9886360145086bd3c8d16d9c7f5b2e5929aaf27ba92403cadb9ae3bf08bea6d966cd495 +>>>>>>> next MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906 diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild index d8ea7270da3a..a9cdaa09a785 100644 --- a/dev-libs/libffi/libffi-3.3_rc0.ebuild +++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild @@ -13,7 +13,11 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta LICENSE="MIT" SLOT="0/7" # SONAME=libffi.so.7 +<<<<<<< HEAD +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next IUSE="debug pax_kernel static-libs test" RDEPEND="" diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest index 07144af3a2b5..5552b7511623 100644 --- a/dev-libs/libvterm/Manifest +++ b/dev-libs/libvterm/Manifest @@ -1,5 +1,14 @@ DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0 +<<<<<<< HEAD +DIST libvterm-0.1.tar.gz 69960 BLAKE2B 27849727b8fec8b807c151a035286f3f4ee0464995271771da190b270a4b6c4d4258f5635e4a14418d6ff3fae981f30d2c9bdeb5c7b3f0ca74eed3a99642e354 SHA512 35317b6998764336edca6a4a011714f87853996a43dbd907d9a73013d9169f9ff39fbeaa405fd0504830b302518ead1f9b6c00fdfc46ae8f7e51cff1a5464dc7 +EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B 5eba9e60a96c6197e0630c4f324f1fe4803ddc24c5e0a2113fe48e3135e7b3dbbc22f3cd7be57851f37e2484516e044c42a623560580281f3e33e3f4f0e5321f SHA512 b3314341167cd00f0e849e566da865acaf84644f82b0370a87e25b5f1384919b35ede81d65ce3fd30302e294c0beeeae1dec06ad324ea886bf83596cf4ba4644 +EBUILD libvterm-0.0_pre20171004.ebuild 765 BLAKE2B 36262c4dd36157dccd571bf3218573fb802a04e71061676b8f8aec4238bfbd54950e555e234cb5f100461ee196befc584c69b9d5b705a4c8740f109047380e2c SHA512 d6fa75efa138639ade62b6d3ec37e0e1d6a36e8ac5273e7a4c0f12cb4bd29feae154b637c5559e5e5fd7088f2358a2d76e8d2b3c871d2495022568b9d25c7146 +EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55 +EBUILD libvterm-0.1.ebuild 938 BLAKE2B 3871580b8a9784efab338f07096629d772e9c61d8d090846566894880852969441cad50813803ddfe7f47d0e6bebefad754646b98d62fa6391157a7a4e8d7d3a SHA512 b06bdb65695c90d54778b8875f8c46e89c18feea2fcadc09adf76d5bf826af249839d5db6cd4457b4b2e095be346dcd71caa982f4f2e70c1233902b14541f228 +MISC metadata.xml 361 BLAKE2B 136d9b4f9d9a69c7bbd32343e71208ba7a128e33038899b9369ed5440935f8d171589aef9902e15260cde2d989c8dc3d9eb11432e7383e33cab83d79eefa41c7 SHA512 cc0e766d31c2b6ca0eb1816403d0d73d187986ffb40c0b9d677d9f40037d3f0e6cba5f08401eea8929cb5affed0b3f1c99cf0a6f8aa026e7b339665327483c9d +======= DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757 EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55 EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22 +>>>>>>> next diff --git a/dev-libs/libvterm/libvterm-0.1.ebuild b/dev-libs/libvterm/libvterm-0.1.ebuild new file mode 100644 index 000000000000..7109c9ce4426 --- /dev/null +++ b/dev-libs/libvterm/libvterm-0.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic + +DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator" +HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/" +SRC_URI="https://launchpad.net/${PN}/trunk/v${PV}/+download/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +BDEPEND=" + dev-lang/perl + sys-devel/libtool + virtual/pkgconfig +" +DEPEND="" +RDEPEND="!dev-libs/libvterm-neovim" + +src_prepare() { + default + # Remove broken test + rm "t/63screen_resize.test" || die +} + +src_compile() { + append-cflags -fPIC + emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" +} + +src_install() { + emake \ + VERBOSE=1 \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${D}" install + find "${D}" -name '*.la' -delete || die "Failed to prune libtool files" +} diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml index 119029816579..e6fc33367084 100644 --- a/dev-libs/libvterm/metadata.xml +++ b/dev-libs/libvterm/metadata.xml @@ -6,10 +6,13 @@ <name>Bernardo Meurer</name> </maintainer> <maintainer type="project"> +<<<<<<< HEAD +======= <email>proxy-maint@gentoo.org</email> <name>Gentoo Proxy Maintainers Project</name> </maintainer> <maintainer type="project"> +>>>>>>> next <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest index b410815859e5..3fee8dee0640 100644 --- a/dev-libs/libxmlb/Manifest +++ b/dev-libs/libxmlb/Manifest @@ -4,6 +4,9 @@ DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f DIST libxmlb-0.1.8.tar.gz 85945 BLAKE2B 4d17aaf4e5ed3001a4db24e7ca220cba3fc14ee446b127b65b545fab997c7c31835b57b0dd9d23da74200d774e3986558e7618789f42d1e95c0734fa5bb6e098 SHA512 4109f171da4622429d18afdb9ae183a64f89e0b92df285efae5736017970f877a92391876969c20894184c6d5df96390ccd46be1d1087882a5461476c39e433a EBUILD libxmlb-0.1.10.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868 EBUILD libxmlb-0.1.11.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f +<<<<<<< HEAD +======= EBUILD libxmlb-0.1.12.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f +>>>>>>> next EBUILD libxmlb-0.1.8.ebuild 901 BLAKE2B 62fa0a3128f0f46cf26ca2ad705f18bc528c9646db2021518ad62616b31a1103fec0fe4d71916c96751b630e392b34b7c70d1626d333f06f747f8ca3a3d2150d SHA512 533a364552f01625add7cf7cecfbf839c7aac8e93d6096ab94f2d3ca847cc6ed5cd15cf777c5ec9ce876c2016df33b1bf18733be67e39e05a8fa4596489adb51 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 2fd110638e0a..d89379995b7c 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -10,5 +10,9 @@ DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cad DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1 +<<<<<<< HEAD +EBUILD nspr-4.22.ebuild 3888 BLAKE2B 995a072499af5e0b947f4a8ee3e28af65359f666981e5b2ff242922a3511d6818786c6272ba54776102f4b2c0c404ba7a0c6d060ff56d9ceac7308d2f8d93c39 SHA512 94bf0bb6ff18f339bbeb8e130b5d135bab539fe0c2586b0e68e346d14fe8cd883d097444211922291a4f0d72a86eb4f9c4c23f304a63d76be6925d77172c4ce4 +======= EBUILD nspr-4.22.ebuild 3887 BLAKE2B b437b0b5870026275731224ddd2e1af368caf48deb4cec30467f3232e6b91267e439121dd54423b5c424ec5427898842006258ad84d589bfad79e5d623f17b84 SHA512 2613310f6e3fb741468297a884d3ade0da92c33b092100695dca5f3b80ad3de6ff5441881f50924cff6af87cc750034ecf6e731d18b2ba4ff58c84d9356c25fd +>>>>>>> next MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23 diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild index a2dcc1d15a8d..a76257f19ee2 100644 --- a/dev-libs/nspr/nspr-4.22.ebuild +++ b/dev-libs/nspr/nspr-4.22.ebuild @@ -13,7 +13,11 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" +<<<<<<< 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 IUSE="debug elibc_musl" MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index e3340e8d422e..2b9863c39fe6 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -10,5 +10,9 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 EBUILD nss-3.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088 +<<<<<<< HEAD +EBUILD nss-3.46.ebuild 9479 BLAKE2B 1a97bcd13b5876f8f2e1856831a303107728ffa54383ef5e8dd83b754cd3e4d0a8ad4aa3318e83d73b97212c7ab58cbe80d6fd99c3c6a96c866ba5facc7a696c SHA512 7b7df99a2897afae6f0860bf8a33598ed46bddfba7ef9cddbf7ac5913a59612af99e80212cb41e30651aa86a50a0c5f07cbafa259e496ed0fdfc099c56133da6 +======= EBUILD nss-3.46.ebuild 9478 BLAKE2B ce357178071d9b93eb2e9838ff8870332bdc4790b1f016d5b54ff6b4df62e2293f5fb5a866f61df1e70f7847bc4dcea3b3767b868801908daed4b4d324e462a1 SHA512 53689f8bc455f6256302a8941813bf7ef4e6e7d8b8cb27aff1df19b55cbefc461706eca7e97f1a56ce7701a0d760064cc821e73b32b609fab1f050b72d65d6c4 +>>>>>>> next MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0 diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild index 83757c5a353c..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}]" diff --git a/dev-libs/rlottie/Manifest b/dev-libs/rlottie/Manifest index 38b43422dc4b..af0834de785b 100644 --- a/dev-libs/rlottie/Manifest +++ b/dev-libs/rlottie/Manifest @@ -1,3 +1,7 @@ DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed +<<<<<<< HEAD +EBUILD rlottie-0.0.1_pre20190920.ebuild 770 BLAKE2B 7d5f3d0524d229d83c8d235c07fb3b075936cdb5358a4690645de10ecdfb9cf646c39ed3a4a1ca2bde1c794ec6f765f44305a903833beee931165afbc021706d SHA512 e20d113e017d1eff974438a21da357a2d3ac04e01b527f3b14f7f8a2e27ece11126c02282e6a88ed7d20d20beedeb33418652bdd78c24b5f8bfd5f7fe0f6c423 +======= EBUILD rlottie-0.0.1_pre20190920.ebuild 787 BLAKE2B 9c04e9b288dd3d812847bcd7b199fd8bb914e282c198011896eaf1736fc387b3b6736f0cf45d95d87b1a2644340a4c4171b345388fd3d4fbc630e2d6928ca04f SHA512 cdd841c441cfd93432323195515adfdcb79ed6945400e76ccbadbbab9ff456058d47dcacbda3a33091a5af84556cf36011efd974d87d4615643563365c3b71a1 +>>>>>>> next MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c diff --git a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild index db0b6fcd2236..e7c6b6951e12 100644 --- a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild +++ b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild @@ -13,7 +13,11 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}. LICENSE="BSD FTL LGPL-2.1 MIT" SLOT="0" +<<<<<<< HEAD +KEYWORDS="~amd64 ~x86" +======= KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +>>>>>>> next IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz Binary files differindex 6929fcd860f1..cf400ae81b0e 100644 --- a/dev-python/Manifest.gz +++ b/dev-python/Manifest.gz diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest index 41f41e20d5dd..ff5422bd6c32 100644 --- a/dev-python/PyQtWebEngine/Manifest +++ b/dev-python/PyQtWebEngine/Manifest @@ -1,5 +1,11 @@ DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010 +<<<<<<< HEAD +DIST PyQtWebEngine_gpl-5.13.1.tar.gz 44883 BLAKE2B 1a31e8204dda4754bb5ee73b5e179d2ce92912eb333c0d62251aecc2623ebd0deea7f99a0a6b73a45b34c6ee0f55586daeb618c19039731d64ed6a12b552e551 SHA512 a1c39da5962b754a1ceff26c5baad0c11f0193f90db31ed2e25d8a4fda6ec84b10d6f3c35da0dee5cca938b42d6232620c57b3a62e5e78d274513bf422950dd5 +EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb +EBUILD PyQtWebEngine-5.13.1.ebuild 1713 BLAKE2B 085effbbb3c43dcd9cd18d08ddf35b4e26dd5c1bcb80e298e422bc6c432aa157026043473612a81f6a6a37cd3c96a649da443b236cebcf49141a690dfb7d49c6 SHA512 b81e603090920d6e2da7ca11d3d8e851be160344282ec6cf25f9ccc621ef1c915ae9f3fddd2032b04b2fa522999fe5d5afe016832dd7c879aa18e739c0e636b9 +======= DIST PyQtWebEngine_gpl-5.13.2.dev1909181828.tar.gz 45197 BLAKE2B 203dacf4322e8293221a59fd9a2f34a42981aefd5861e47141b3cc58770ff9cff2c0922de1f03c0eaff4b0d1c42bf26b172787cb3fbbc9367e9d8b717e927d50 SHA512 ebb1b6de8cba1619c96a4a120b51bfe885b737669f246f4e5c2cd5023320e74f0927a62a0b87586b519ab5767e0bd7b01444e7298381ffecc036682b4f1fcaae EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb EBUILD PyQtWebEngine-5.13.2_pre1909181828.ebuild 1713 BLAKE2B 085effbbb3c43dcd9cd18d08ddf35b4e26dd5c1bcb80e298e422bc6c432aa157026043473612a81f6a6a37cd3c96a649da443b236cebcf49141a690dfb7d49c6 SHA512 b81e603090920d6e2da7ca11d3d8e851be160344282ec6cf25f9ccc621ef1c915ae9f3fddd2032b04b2fa522999fe5d5afe016832dd7c879aa18e739c0e636b9 +>>>>>>> next MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862 diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild new file mode 100644 index 000000000000..2492f56e0e0e --- /dev/null +++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +inherit python-r1 qmake-utils + +DESCRIPTION="Python bindings for QtWebEngine" +HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" + +MY_PN=PyQtWebEngine +MY_P=${MY_PN}_gpl-${PV/_pre/.dev} +if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" +else + SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz" +fi + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="debug" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}] + >=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}] + dev-qt/qtcore:5 + dev-qt/qtwebengine:5[widgets] +" +DEPEND="${RDEPEND} + >=dev-python/sip-4.19.14[${PYTHON_USEDEP}] +" + +S=${WORKDIR}/${MY_P} + +src_configure() { + configuration() { + local myconf=( + "${PYTHON}" + "${S}"/configure.py + --qmake="$(qt5_get_bindir)"/qmake + $(usex debug '--debug --trace' '') + --verbose + ) + echo "${myconf[@]}" + "${myconf[@]}" || die + + # Fix parallel install failure + sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die + + # Run eqmake to respect toolchain and build flags + eqmake5 -recursive ${MY_PN}.pro + } + python_foreach_impl run_in_build_dir configuration +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + installation() { + emake INSTALL_ROOT="${D}" install + python_optimize + } + python_foreach_impl run_in_build_dir installation + + einstalldocs +} diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest index 9113887b893b..1b8f176dae14 100644 --- a/dev-python/m2r/Manifest +++ b/dev-python/m2r/Manifest @@ -8,5 +8,9 @@ DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044 EBUILD m2r-0.1.12.ebuild 1218 BLAKE2B 557c674f096982aa69f048e5d85936737cb7856363ba83386c4dcd30ab5fc452e888ccf1d6bd7d737ade17415af3edb1b17018a286f0ae0f635c945333014c0a SHA512 c5d3a2bde7e5f3d3c6e7f36d01441f46c816e6d6f3a0897be6307d5f0f33eff8344e2d7f8c3e832f6f66c6efd91b9d1b8321a8c5557d99c7d9283ca7a189c8e6 EBUILD m2r-0.1.14.ebuild 1298 BLAKE2B 9c729388bb13f154935f096040e5dc3f81c5886144b31e167cf6b8421f2c5023c95cec1ec82f6fd984706100b23e015aef5f9b13e9fa422b5bb440ddb42fcc7e SHA512 5013eb2fcfc96e9b947bf5cc52488cb9598c23830fafd801c0531f51b11f1165bc74f9929eafb24000cdce8fb35f3172e54bb766b011b97e20f93945f72f59bb EBUILD m2r-0.1.5.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf +<<<<<<< HEAD +EBUILD m2r-0.1.6.ebuild 1273 BLAKE2B 9bdf9ab39c40ff14cecc9efc5ef48c82958285bee81325f62d2894a66d6915b2da7aede0d478fbeed09fbd054dfa7eb53498f36b83b895f05e017aeca74eb81a SHA512 4a5ebe86949f59e8bc23344c322aae00da0c5756bfef8d96c57dca64c1a0b6bcfe994da19a786147d89c9b782a9fc53760f526113010d72994cba22a45df5fca +======= EBUILD m2r-0.1.6.ebuild 1293 BLAKE2B 0dafe99d353eba5465ca2bdf093092cd573dca25b5e7ba4fe5ca0556bc076db319606ee49753a12ea3a7bbcb20482700699ac8301faa0a4f3e96b3b8fae219e9 SHA512 076d2b335cd09a118281bb7003af3d7953525d45238f02615467723f0d07a347d52e650b32bb17c9979474d939ddbe32083916233232988ec10a8d24d96b0dda +>>>>>>> next MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 10e31dabeec2..c864535dfd31 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 28ea9f1e296f..caa14937747f 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -2,5 +2,9 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae0692 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 EBUILD qtgui-5.12.3-r1.ebuild 3719 BLAKE2B 6d8b24192afbda0c9f4955ef6127fa1b334cdfde00a8e78c9eeffc52496d0a8801642c21bc8dd730ed67373c32f738d4f804e6cc3a5901b38360eb39d15caf27 SHA512 5ad5f7b427fb989f0f3bbed475932808d7b598b53d9e16bd25bbb57ec75127c6ccc42295e26446be29516a881bd42989936c665ef48af2ff2c984d617aeb4a16 +<<<<<<< HEAD +EBUILD qtgui-5.12.4.ebuild 3866 BLAKE2B ad2901c3c6d701c11fce868f9a82e9f986b26fac54bd89a7b4727f0195ae2e881b5f2daa79f3fc433864d6de2daed9fed18aa58acbe9686b4ea523234bb801a1 SHA512 03c883fe4d9f8941b8274d08898ee9d0711719025d16550ed4b00a21e85000ec7edf14e805ad62fbb869a2b942ace5d0932af990128218390ae53954ebd40774 +======= +>>>>>>> next EBUILD qtgui-5.12.5.ebuild 3807 BLAKE2B 8a746b5c5fea17dbe9b67d80aa0b6ae31e6ed0a8e2a8837e5d39f738bf32030c2512cc6ccbf57af5425fcf6695177a28fbd9a2ddf98a2fc2b9e294137c378ad6 SHA512 f4d7fba9990fccc579b720c9361f81567e9faa1e5518a38a5ab32d6cf79b64d7b2cdbfc44979f0d8687ab0c47abeb48c10b547d2aed107b6413671f884ade87a MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz Binary files differindex c438a4980b1f..e6a585fccd23 100644 --- a/dev-ruby/Manifest.gz +++ b/dev-ruby/Manifest.gz diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest index 349870d9e5dc..c0e19eacde2d 100644 --- a/dev-ruby/path_expander/Manifest +++ b/dev-ruby/path_expander/Manifest @@ -1,9 +1,15 @@ DIST path_expander-1.0.3.gem 13312 BLAKE2B 79be135b73f192e86cbdfae7a203434c4c8b1535c2db959141db79fd6a2eedd92c6436376485ccf3f8c15efcda31de40a7dd5a8c71eece17ca1e72f7bd7e95b7 SHA512 e05d66759a863f69845e41da1677f2020111e85e206d58acb93d18e044833f70b9420929e731884e6bcd156988ca3ae836f9913697ec85756a71f68499469ef2 DIST path_expander-1.0.4.gem 13312 BLAKE2B 9372b904a490cc07a29430a397d84d09484486517769a7803e983af31f6a181c7a5f8c2af15e5fcdfd9b794c9bfa1f5bd908c39d22c2b2e2dc7b8eb0a929592c SHA512 69d45724f3ba406a6dc96df06be1dd9cc869a52c4ea19eac9b900a8db083ce04fad4dbb37e5e75f5a229114f7b65023df2edd7c367a0670432e74105cd3c298c DIST path_expander-1.0.5.gem 13312 BLAKE2B 2edea26334df78dc5f3b9b4b0030141c7af61c93c47a921b6dffe02dd8018336dedb9d5a5dba92ccad42ca935d8e4c58be9f3c284263bac56af4d31c107f9258 SHA512 ef5d4798481988ed07ea801c8e7173ac6bdc62554a9c38337e09853f87e49783b64a4e9ee4f4fc63968ebbd324e4960a4ccbc53bded64248d89de25a930c11fb +<<<<<<< HEAD +EBUILD path_expander-1.0.3.ebuild 763 BLAKE2B 13ef4de2c0d18b0e8a4d7caf68f8d999867e1f589f4e4b27d6d0618e2a8e20adb7ab03bd6593eb5fee11ce874210b296f0cc56e6ca285d1775d0d7bae57ecc22 SHA512 4172fd07e8184f3d8b234b209720c11014faad8f2aa507e117ae817b014656f3491ba9291922bf8acd80572d56404b553c72c017e78d58f2a587823ea7099326 +EBUILD path_expander-1.0.4.ebuild 749 BLAKE2B 45fea82c358adf7cd21dec1a4b1d84edaf94fd17a7c9c9be5ae3ec61349c741940be400e822b1877d3b7c56a88101e5489854e8dc558784f63690b1af3c4ad31 SHA512 c14007442145b18d62a0e2c34cf4b049cd8b87fd31ec59749cda3705d07b16bc45d8178a0bb07d9a5aefe8a12914061ab134c02f8d7c879bc3ecfe5232520899 +EBUILD path_expander-1.0.5.ebuild 718 BLAKE2B 03ea73d8486924a113f6363e0645e8f329d82af7b510400842d6552afa28faaecca2a09139c1f52b81269e64fe0cdfae91278a78267754474f83a9aa6ecc782b SHA512 78b32569fb576be12c7ba35b36edda61090e30546f9892dca42c3647ae5f06767c89f073545d21b714d5b9c6790a48571b9be8c55db1f7d749e101cd49f87e2c +======= DIST path_expander-1.1.0.gem 13312 BLAKE2B dca42a0e995d7ef87cef3dd26251ce378df33db557c5089b58f1130ed4c61b5521012198e381853c3583601d990aeff3a8463393e89e891b2ca9c923831ba31d SHA512 eebcd1caafba5c40512cc0c6e3419137fc169215d2eac77914419d9f3a6e200350d742b13953b2dbbdd532c9ef73e950c920017a4f178941c1e04ee832e038f7 EBUILD path_expander-1.0.3.ebuild 763 BLAKE2B 13ef4de2c0d18b0e8a4d7caf68f8d999867e1f589f4e4b27d6d0618e2a8e20adb7ab03bd6593eb5fee11ce874210b296f0cc56e6ca285d1775d0d7bae57ecc22 SHA512 4172fd07e8184f3d8b234b209720c11014faad8f2aa507e117ae817b014656f3491ba9291922bf8acd80572d56404b553c72c017e78d58f2a587823ea7099326 EBUILD path_expander-1.0.4.ebuild 749 BLAKE2B 45fea82c358adf7cd21dec1a4b1d84edaf94fd17a7c9c9be5ae3ec61349c741940be400e822b1877d3b7c56a88101e5489854e8dc558784f63690b1af3c4ad31 SHA512 c14007442145b18d62a0e2c34cf4b049cd8b87fd31ec59749cda3705d07b16bc45d8178a0bb07d9a5aefe8a12914061ab134c02f8d7c879bc3ecfe5232520899 EBUILD path_expander-1.0.5.ebuild 718 BLAKE2B 03ea73d8486924a113f6363e0645e8f329d82af7b510400842d6552afa28faaecca2a09139c1f52b81269e64fe0cdfae91278a78267754474f83a9aa6ecc782b SHA512 78b32569fb576be12c7ba35b36edda61090e30546f9892dca42c3647ae5f06767c89f073545d21b714d5b9c6790a48571b9be8c55db1f7d749e101cd49f87e2c EBUILD path_expander-1.1.0.ebuild 718 BLAKE2B 03ea73d8486924a113f6363e0645e8f329d82af7b510400842d6552afa28faaecca2a09139c1f52b81269e64fe0cdfae91278a78267754474f83a9aa6ecc782b SHA512 78b32569fb576be12c7ba35b36edda61090e30546f9892dca42c3647ae5f06767c89f073545d21b714d5b9c6790a48571b9be8c55db1f7d749e101cd49f87e2c +>>>>>>> next MISC metadata.xml 339 BLAKE2B 46f1672ac66227d580c5f13621d10aa58b2a17373eb108a190e64203ca4dfaa92aee5dff0c71551a52af7cb58a77336f34328581fdcb75e68ecf7698071d1100 SHA512 9defdaf2e5b30460816c7e929aabc8421c4afeba6ca56a60001bff5047052a2a7f7928a683707b26582facb2886f05a4ecb56e5036fbfc4f75d4d3353fefb8a5 diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz Binary files differindex 911d1388c5fd..ff91b822f35b 100644 --- a/dev-tcltk/Manifest.gz +++ b/dev-tcltk/Manifest.gz diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz Binary files differindex 7fe2106feb10..22903c7010b3 100644 --- a/dev-tex/Manifest.gz +++ b/dev-tex/Manifest.gz diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz Binary files differindex 46581e5c6267..3a309498cb1b 100644 --- a/dev-texlive/Manifest.gz +++ b/dev-texlive/Manifest.gz diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest index b1457ebf2df6..3fdca51a2e89 100644 --- a/dev-texlive/texlive-pictures/Manifest +++ b/dev-texlive/texlive-pictures/Manifest @@ -800,5 +800,9 @@ DIST texlive-module-xypic-2019.tar.xz 709808 BLAKE2B 7192d7d06eb8fec456213d81244 DIST texlive-module-xypic.doc-2017.tar.xz 3923164 BLAKE2B 05428b38455175d31fb3f6cd492a7209ad90370c15467637894e387836d7c25d669263c16382b24d1ed060b3e7d50282a06197cc79e5fd5731b9c92f1097baed SHA512 9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc DIST texlive-module-xypic.doc-2019.tar.xz 3923196 BLAKE2B 3a1598c0f34833f8336a9301102b259b8ccf293b1866126d67c812e933c3eddb4489dd733aa47e0b8b4a79fe0965a06a981c0d4420dfd8beac148edc581ac89e SHA512 cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff EBUILD texlive-pictures-2017.ebuild 5535 BLAKE2B 7574f015be350afe1aab6d08a0d5e67418de4ad401e461f75c088313b28a01ec45a94bf6ff1dbe8ca8e82429f8f0e72d435e411bf1f0651682f1934cb1136f26 SHA512 5b4ef2b910433f9afbf7e77112d2cea8eccb896ea9e10ab37442a55da1736277eaa7fdd8b529fb62fc20a3824a4ad96da766f749739eedf0be8c18caf07846d5 +<<<<<<< HEAD +EBUILD texlive-pictures-2019.ebuild 6570 BLAKE2B eb17d4c15a2f36c6f3445229fc72a787210d3a29f365d5573ee097fe55241cb78e66c7fa48cb8b01c14f6a9371cb14e4cfeea0e825a15e0177d3b457e0d17d56 SHA512 01cb7028a5eddbf9e759cdd1d7dc1999caf52c96ad1a0e4ab2a21eabfd0e287f134437c7b1c8740de41451f9c272b5d6cee5195f8ba2b81e1fb39fb39b9e5e2f +======= EBUILD texlive-pictures-2019.ebuild 6566 BLAKE2B 042d72a60186de83270eec5e85b6b9eaa49cf2d72292579bc1be64ae13694017e926104d5d47a44f3516d6a38e12649a6903fd64cdafd1e01de41dcc5cea40dd SHA512 e7126c0c58a960a275932986f765715d9af4d1a03a7fe59c591496ded1de2842bd709268eae18b0309586867053b0cdc934329b40cd3a05327b9c0714fb990e1 +>>>>>>> next MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957 diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex 01cdd4e8afdb..dc3d0d942e9d 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest index e1bf577ac405..97502dd41d1a 100644 --- a/dev-util/bless/Manifest +++ b/dev-util/bless/Manifest @@ -5,5 +5,9 @@ DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c224 DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5 EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc EBUILD bless-0.6.0-r4.ebuild 1188 BLAKE2B 97f0b498f789a511f4a24d57d23c18254561435cb5e197d94fe2e026e0047e1d7f18bc340a938bf57afa35c14682fb00b7f4c2375af8f61a0c8cceb678a99380 SHA512 652cf121dc16d0e4d745092de05a17f6c2f9adb34ffdc35800893a2ee038dc05a64ad93d66a30311f71cf1a7c2c0c70a5446756756f97a7e7a412091d63fc968 +<<<<<<< HEAD +EBUILD bless-0.6.2.ebuild 1089 BLAKE2B 9f655705a567c69a2918ae0af95a2e3f7862eafa2a4d808606ad75c83dbb6ad69e3abdd34a72e9f8e74a119442905bab41b1648047ffdcc5568bf12407d77310 SHA512 480cc2c321892ee1d49325a4b2686c607a314dd347d3218ae7992fe9af770b3545f8af77bbdeb370166fbc2e4b11a21cc542b15121987e6406c652d36136ae0f +======= EBUILD bless-0.6.2-r1.ebuild 1091 BLAKE2B a26ddc20916d8500116c05252dca058f4145eac973d27e697863984121b3d2f477eade47412deb48cdb918886e7bacb4654946bd6f0ec7c31eaedc5151b66c6f SHA512 def48401109372031c03507ffc869a995d82b93c293b8e10fd503f1d9e87ff00b6988c15a19f774793fe7be1983cc1a4ede0c79c5b894ba0dba9950fc093f5c3 +>>>>>>> next MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9 diff --git a/dev-util/bless/bless-0.6.2.ebuild b/dev-util/bless/bless-0.6.2.ebuild new file mode 100644 index 000000000000..d2f0d9b79759 --- /dev/null +++ b/dev-util/bless/bless-0.6.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools gnome2 mono-env + +DESCRIPTION="GTK# Hex Editor" +HOMEPAGE="https://github.com/afrantzis/Bless/" +SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +# EGIT_REPO_URI="https://github.com/afrantzis/bless/" +# EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=" + >=dev-lang/mono-1.1.14 + >=dev-dotnet/gtk-sharp-2.12.21 +" +DEPEND="${RDEPEND} + app-text/rarian + >=sys-devel/gettext-0.15 + virtual/pkgconfig +" + +# See bug 278162 +# Waiting on nunit ebuild entering the tree +RESTRICT="test" + +pkg_setup() { + mono-env_pkg_setup +} + +src_prepare() { + eautoreconf + # The autoreconf expects INSTALL to have been copied over by autoconf + touch "${S}/INSTALL" + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --enable-unix-specific \ + $(use_enable debug) +} + +src_install() { + default + + mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}" || die "Unable to make documentation version-specific." +} diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest index 0a66402463ed..6da6921bf1aa 100644 --- a/dev-util/clion/Manifest +++ b/dev-util/clion/Manifest @@ -1,3 +1,7 @@ DIST clion-2019.2.1.tar.gz 493159056 BLAKE2B 8264befab42af1a73f9332a9a1bbfc91e9bf09108b0a544d18296feafd200f6c0013be768a5f7dfba29da689903945d81e54b95291d0952c2336be98b0f6357f SHA512 ed96df5872f0c3d911df15b3d00e045df5726d0d4d70225ace2b41b2e8e7ab3c04f22a8f00e9232472853a5ff5baa62b8b2363fbb6d68ba785a74e34c05d4abc +<<<<<<< HEAD +EBUILD clion-2019.2.1.ebuild 1985 BLAKE2B 79f06071c573c312dd787c8974e342e0a9ec4d107199d8305e72a851724c0f9a39e6a9f555ce183da3bb74fc05182536123403f111e584bda72d9915c479d3bf SHA512 b7972ab43f90af2d74e4b8b2c588b0964944b4ac1765b12edf7becd0d224a80602751695d6b1903b02fd83fa52e0802d749fbc3cea35a1b87920ca40a8742642 +======= EBUILD clion-2019.2.1.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de +>>>>>>> next MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871 diff --git a/dev-util/clion/clion-2019.2.1.ebuild b/dev-util/clion/clion-2019.2.1.ebuild index fbe93d313de5..b3360455dab5 100644 --- a/dev-util/clion/clion-2019.2.1.ebuild +++ b/dev-util/clion/clion-2019.2.1.ebuild @@ -9,13 +9,11 @@ DESCRIPTION="A complete toolset for C and C++ development" HOMEPAGE="https://www.jetbrains.com/clion" SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) - Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 - EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM - LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB" +LICENSE="IDEA + || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )" SLOT="0" KEYWORDS="~amd64 ~x86" -RESTRICT="bindist mirror splitdebug" +RESTRICT="mirror splitdebug" IUSE="custom-jdk" # RDEPENDS may cause false positives in repoman. diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 16780d2deda3..e926bc25f3b3 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz Binary files differindex c6deb2656778..c2b5d8645d36 100644 --- a/games-emulation/Manifest.gz +++ b/games-emulation/Manifest.gz diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz Binary files differindex 0c0a781ee095..fce27edb74a0 100644 --- a/games-server/Manifest.gz +++ b/games-server/Manifest.gz diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex 6092dcd29859..c4d42c4d8b69 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index d3c4eb6793ec..5b04f78920b2 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -7,5 +7,9 @@ AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd0 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392 EBUILD nautilus-3.30.5-r1.ebuild 2822 BLAKE2B 6b115495fb078e7eee306575f3a177fad9dee08b898e28980319656d8dd6624e568042ecca60ba164e474eb71fbe24834797460edaaf2ddfaea6d3ec608d195e SHA512 4c3a802cfa10e8315ecd854dc64f7a2bde19c3e2a3a196ff670aa01a40de83abca7ab27c98bae8898343316333192920f3f12450d267e9d38e04b77e1aa2f0e5 +<<<<<<< HEAD +EBUILD nautilus-3.32.3.ebuild 2965 BLAKE2B f0ae2d8d8df70b9e5c7d70027c6b1340ea518f77c3d8625ed9240255a11bd3ccb9ef2e83fbe006b83f2e71d1d26714d8d5dc79314594c1e2a7e33bdd07b3005d SHA512 23ee9d7623c6121e4ec67b8a9db0da41ccb7fca90fd62f76a3012115499c2585c99334d1631f9dce1d150abd1585da203c7d8cc398601fbf48423070e3bcffe3 +======= EBUILD nautilus-3.32.3.ebuild 3078 BLAKE2B 91ff9260991be11484aa65e12f945708658d13cbbe26a557a5c5b8e7025d826f5b98eff980171865cd71d33d392f216dc03ae76bfd52554216ab7fb12c8dd3c9 SHA512 b6b8634003ad671d6cff134d20d4fd6a4d1b8f2ee840c6413ce9bbf1cc5969aa6fe13377e70fe474733c15a0e4461c55169f83f24543c7643efefcb641d39adf +>>>>>>> next MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981 diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild index ef2cd4c4480b..3197ede8970f 100644 --- a/gnome-base/nautilus/nautilus-3.32.3.ebuild +++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild @@ -35,8 +35,12 @@ RDEPEND="${COMMON_DEPEND} seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) +<<<<<<< HEAD +" +======= >=app-misc/tracker-miners-2.0:= " # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners +>>>>>>> next DEPEND="${COMMON_DEPEND} media-libs/fontconfig " diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz Binary files differindex 578a49a88171..1005e90451df 100644 --- a/gnome-extra/Manifest.gz +++ b/gnome-extra/Manifest.gz diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz Binary files differindex beb0272229a8..48c54e5b9b8a 100644 --- a/gui-wm/Manifest.gz +++ b/gui-wm/Manifest.gz diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz Binary files differindex 6fe57abcff86..e15c16ff34dc 100644 --- a/kde-misc/Manifest.gz +++ b/kde-misc/Manifest.gz diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz Binary files differindex 94d5a2ebb779..4ead9d70ca9f 100644 --- a/mail-client/Manifest.gz +++ b/mail-client/Manifest.gz diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index d848c0020111..2ff4440fbcc5 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -10,6 +10,11 @@ DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe DIST mutt-gentoo-1.12.2-patches-r0.tar.xz 106384 BLAKE2B 9329c3629d4c8d34e42a422e76dc0ec0f3a4b697fc59586c0258716bb9e4a1ff26cccc20f7ecbc340a92e23b24baa7514041274b3b2b4a73ef9dd36536d8206a SHA512 0aafa589a98e10044a36e578cae5e1e08ae66a0fe773763852441d9410f65f8bf6bd0256e1b0f059bd5ace6fb7ed90f63b5c3dd4b6fbdb6e7c3d2af8a95b266f EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287 EBUILD mutt-1.11.4.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f +<<<<<<< HEAD +EBUILD mutt-1.12.0.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f +EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf +======= EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf EBUILD mutt-1.12.2.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf +>>>>>>> next MISC metadata.xml 1606 BLAKE2B 4b25867379e06da3cb6cc6500c42c731e18512be107f69df9764689ce2de3741ce235d0f610711e4fbfb256319b1343647075da7808532a63946451f7e6107f5 SHA512 054aee931ba2bffe79982ffbb2f32282f8c7277319915ef55a2a2cd3e39f20b1ab90c664016630aef63f0d325fbd3934336f0d5bb25ff610ecb26fc9f9fc66d1 diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest index 8620c7e1790a..fc36649b7cdb 100644 --- a/mail-client/thunderbird-bin/Manifest +++ b/mail-client/thunderbird-bin/Manifest @@ -167,6 +167,129 @@ DIST thunderbird-60.9.0-uk.xpi 684182 BLAKE2B 2bfed5f8b844be664e08cb0bf4932d0c9f DIST thunderbird-60.9.0-vi.xpi 637210 BLAKE2B c48d8004d269350410fdfa2f5beb4ef6e37e0635bf288f5c8cde3e4e043acc1fdf4c81b61db999baf4a050261d9f80d5b6bbdb298010fc44496b37d34ac32887 SHA512 045a871f7f316c3fe86cb45b9748ce621ac333ef52dce8b7b6284cbd50e3a91c7b1feec68737b611f4ee2902ca1f934825021d67470ed0f5451e1b9f4d8df325 DIST thunderbird-60.9.0-zh-CN.xpi 626309 BLAKE2B 81e2846b570804b0aeb2212107eae1ceeb55789a5d5fe07b4f9d40e43d6e78d2ff3319668958d2f2c28779e8c6d0693f2f61e0d761098ca73a4ab30b3748da18 SHA512 d82844d69ba20b220e88b6fd425ae355d1cc57c40405dc1dee6699454c87aa36031b1e9f08f85abfdcdf6371a529f0eee8b3b00bc8b7fe149383add59b9d8420 DIST thunderbird-60.9.0-zh-TW.xpi 626217 BLAKE2B c6739b670cda85e955b53a6edd704568c52eb38c00d69a2f222e8b991075071183d53e520dcd716d82826b6d9e0af4db2dc46a732790c71e5607f7f4c53067ef SHA512 efeb58ffdbd53e445a2427035f1857d2b02c763e6f75eac58652fa72560a74e4036ec65b2352ed4633d5f54a0b5aa4571f7a582ac2fc51a92d127ff126cdbafd +<<<<<<< HEAD +DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908 +DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f +DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8 +DIST thunderbird-68.0-bg.xpi 646231 BLAKE2B 1bdf1354b9016f65427158b7cdc6a579fca36b2371b822c67a865fe00730a3d27382a2cc95714907b079d98d5c751d6e47c3e50e7213a3745805baa32648f342 SHA512 4dc0f6cb5d9000a6fb247dc838ad0aa78403ec1cd877343e44dd21b3a8538017a697ca17a56305e242e9a4e5b463ff90f97eab4dceac96b7944c42464642b96c +DIST thunderbird-68.0-br.xpi 574856 BLAKE2B 34beea12df59f89e4effc02e2cf80d4c1b6cf2bfc6295e8e0f978f5c50c2db3ef7607a5a9b5cd3729751c183628863f64c64c7ff2db9b9be085f2cf70b0608a2 SHA512 d7da4b12c55a0b5bf708c7ff1d479467fa66a2cc48e3478316b8137d4fd813bc479214a9a2b85633e886237dfa78330ee9ddd4ab8548939ad72cfb1aefee79e3 +DIST thunderbird-68.0-ca.xpi 578443 BLAKE2B 115c2a57bbe4a6c87310ac0bf23091db01e03428d8f3daf9c48b785abfca0533677927021d6731a42171f3d603f487708d7374e80025b9fccb744dc5f21a1066 SHA512 240fc2a770c70c8e86fe5b80efb8224d0ad7ab32df94da7ff995a0182a865d167d46410b0f2ac08569ad706340ca44d783e09d29716dac7ad19f21487b8f2f95 +DIST thunderbird-68.0-cs.xpi 603044 BLAKE2B b72472d609e23b5f1a1c77152daef006cd2813485240bd7350055a0a7f257becdd675b076d4a9365d997a80dc248c8ae2379a3ebaad1a0e0fb08aa790f47dd29 SHA512 2ad612175d867332907512aa3905bd4662d25c4ff2bd6d9b91ecdb5b4144f98dadd033dca289ec2e1ddbfc7ee381f2ee4e2eef6c0d1d1dee212a404333cdf8a4 +DIST thunderbird-68.0-cy.xpi 589906 BLAKE2B 822528f6a5600a62054397fcb0dbe6b1f544560160953de6ef7002e3400b899f648acecf3bc286359561222db6b7377da76cdabcbd3e4402cfd62b2c541d39fa SHA512 9981ad7b33a035d04d90fcdce7a537a08150671f6e81e2dccf61d2a6da213b2b1b7091ef93d80904dfd6cd7bbf978460f3f045384ae9cd5adbcdf747b434ce14 +DIST thunderbird-68.0-da.xpi 588353 BLAKE2B 8e45fd37b250e504f58094667704cf5c9d282943c64f8c2a2ee624eba0018b5a0c51897704ba6ce29a4ab3600fe89fb23528300415ce66b2f8d131f0631fa165 SHA512 1c210cebf73d21d59215a54e09b20ec08479e0c4058a92815c2e17c7f9713e3c6387f41194e2f562d3c7500a3e9cf0d0cadce5da83b972a51164a7334888b890 +DIST thunderbird-68.0-de.xpi 597808 BLAKE2B 64b275b262c402859e17b2a9caa7099349301a48d8c1370e3eaefcef46e4920933f98cdadcb8dfec4ede0881fd575fd7427a2e4a013a888cfe61c62c62b3732f SHA512 820a94b15c2cf1012739e44f6ff9c475ad60e67622931c696f0443d19892db2b697886452f0a9f9fba7d40611d5700ba602b8acdc6833122524e3aff0b05a976 +DIST thunderbird-68.0-el.xpi 699225 BLAKE2B e62dee23e0e92e087adbce7e37ee0e0f79f0ceaddbb0a701e78c17e7772fe611e0969f55614f049af10b688fc1ed2af4dc6d0aced35ea31bd1e3b045015dbfff SHA512 fa73410538d0576f596cc0595961183d81ff786f392a9a8dbaa8f269e16bbc968964be584d50d2170f18295c1b1a4a73514c7134a9d510e5cb2bbc662dc98659 +DIST thunderbird-68.0-en-GB.xpi 556407 BLAKE2B 764f6f0e8c81ccdbd5b1e2b362b18c2098b3dfe003afb9fc29f50cf6601d16cbf8d6823a62ee3795ee9a2fed593ed806d07d5c6ecdb373ae39534346d097211c SHA512 1bfe3e4ba5b7458656d96b9aff69c8bf33708f112616c87008081da5ef9c1295b224e828f5e738e1c729433ef2387ed8d9f09fcf4a479a86c73422dd50ae98a5 +DIST thunderbird-68.0-es-AR.xpi 596555 BLAKE2B 655546f97c74560c92071a5efb3c4c63328dbdf65951553fd4fc779c5f35f1865d5fe180e87991885f965444abeb3428c24a6f142baa38863fdbada4ef65929f SHA512 3b1e33d1f5bb76a0ea5f361f5d09624294eda230322bd350b1199e7d5ab691ce2a720e2c222bfc0244b537f695e8268529f69b5aeeab3ecdc356a7922e02a49c +DIST thunderbird-68.0-es-ES.xpi 518355 BLAKE2B 6a1157a67f667260b6ec5e16320f9b04793be1a2efacaeb516f96d26aa1e247a3e519ea6c1bfea860df4f33ad25c0ae4db969aaeca2ebafc2629dd3d5f415c74 SHA512 3d24445196608d307a6aa4df261c1d4a6473f2bfb82530bdafdd0203587dccb38443e056abb14d735bf9d5ec1e022dc58e0b595c23c4e197195fbd4985200a50 +DIST thunderbird-68.0-et.xpi 573585 BLAKE2B 7ec4dc001da15c653f34f6a809e8ff6f9714013130545843aea23b8daad96a2d910416aeb22e67585e01442de81f433762e3251fc9fc0133d3d4c0de3068d174 SHA512 f540fe0ceab68782c781e81a43d1a425bbcdfa1af49f24113b6b30933cf86e9be7b3e8c34983a5f20311da29f4be90058d07b90297c06d886bcb580ff52fa0b6 +DIST thunderbird-68.0-eu.xpi 579949 BLAKE2B 132bd384dc626a26786b45e3bdd67bac278f9d31d3edcc658c707b3981e94a00303a2a79f10632706fa3394447e4941d71dcbc7563f02a44b678fd9f3a4adce8 SHA512 e2472954fd3b309c182f4359d4e34b029008441f4ec17cde94dd6e3ce97bbfc7a3c523f54ad7bcec5df1a4c36fa3190c8908416b6353fa069c50ec59d28e0ff7 +DIST thunderbird-68.0-fi.xpi 578422 BLAKE2B db7598b706edf7f28399a72a6b30f2f4ca75a4ac4af4e775086f93c39baeb70abd782b41e2034263e962ec24249b5d7256e2ffbc149e3200501bc600c2ddb57b SHA512 f61565baebe3fe086faf3f77724a27d2494bef6dff6d2c3592559a86871104484807d9760283eb6864c92207ceb12bd8d93f699da71ebd9a6aaaa48b729e40e9 +DIST thunderbird-68.0-fr.xpi 607814 BLAKE2B 7a12719e8a8418218b19655d71ca6727628f3841ee7ca857ee3b48926321b29d234863742968e0dfd82f0740ec2a1e92cd1d0b77b230161372cabf1f76deee46 SHA512 8ee94e558cd2854d5d3548f8808b56f4a7c81c57183278b823702499ae186ea2a9ddf91d2a9bc6d0a3b5cf70464a2e5827e8e26daa14ce30623f75d0d324f018 +DIST thunderbird-68.0-fy-NL.xpi 594471 BLAKE2B 6f7f9e5a8692efbcd8f487829fbfa7c15d6f330fa5799375f64a4992b16da299902c5bb20277e557ee775ef4b8f8e87b3ebf29b6823dc13a2dbed11af725fe03 SHA512 aa43427cb603bc5deab2c13cc8565aecc8e2bc505961c527e5eab2406868c0f798876501c9e3960bdffdbe4e13b1936a4b18bc728efb9413c3c67e91c9850384 +DIST thunderbird-68.0-ga-IE.xpi 588714 BLAKE2B f02c68d432e10d17a497fb08657ede02bbc1ee1e8c34b9c33ea315667241b9f8878558ddf98b4f3398f1dc77042cf501288681b527d92faed2148b3e5070ed29 SHA512 d3a71503480f5116e5224a7f9d46d2c5e7a96e2ae9bcc72db264fd89aaf14f85e3dd901fe8258c3f3cfce3a3f5fe8c1c9682eef08908bbd075374b0a9c56cc50 +DIST thunderbird-68.0-gd.xpi 587113 BLAKE2B 80b223cf0e2ce8fa45fb0d1d58a83c729c70a2058c8e115acc9773080c65c42ee8a2fef83572749c89abfb4fd9b73ddf7c4f599cc42e6b125f7d7a0f62346fd6 SHA512 34325901aab83cf273529c0039b9b1b66efc020f1e5f627d7e4b7542bef4fa1ce1bf072ebecd018350d8243929b76bede698157286bd1766472b733950b3853d +DIST thunderbird-68.0-gl.xpi 568400 BLAKE2B 71c7dfd30cff2db1b8ae050bbe5e84dbf7af7bfdec7a344708ddcd08a9fd9af99c1970a3b38488593155c476e4c96172af389fc5f069157685a38cf89437c62f SHA512 0cce294684abe602884f39f06cdf9b757ce42424c1a85baaebbfaeb9db72d90f300706c3e1603d5fad147711d72c0b3e52295a4cd99145298bf3e71f94c0146f +DIST thunderbird-68.0-he.xpi 604792 BLAKE2B 70e298a02f0fdaf532ef460e902aa104d97f2cf379367693ad7ca6c4846267cc56c479a8e9418661a62602a89e9282e5623fafa629ba7bcd204e541ecf1644c6 SHA512 aad7763b63011161bee42d8e1a8dddf118d3ea71b39d135cb049eccf97199ffaf2d10a8211ab1afcebaa2e3492672f98498da7e37eb197168e402964d3917dca +DIST thunderbird-68.0-hr.xpi 583787 BLAKE2B af98f536e0cf26e2d949450efdcc79529056c38cd0eb267b2a3ab5ac5c895ca0ac97b0d78ea3853e03ac0eee51d2b0a45afe2cbe2850da17b7873608f0fa6f85 SHA512 ef327533082e6e8f35ecba996d0ae73c4d2e1f18d4dac7d323f7de2296394ad5ab26ecb2b996210c5d28319546d287addad74623ffed801ac548f8529624d04f +DIST thunderbird-68.0-hsb.xpi 616039 BLAKE2B fedeef8593a328aa262985cd3982a1c23cf2e9da2f3ab119ef5424a71ca2fba23bc76d1534b682ef92212a58fef150266d3240ee934a53e8e5a8118b4203a41a SHA512 9254218b7628cdaf97af82239a05b8287cd3e07c01958a923d67a5f3b681f52c3ae96b8c33127b289f080eaf69e651218cfe9ebaa49f9c55303784658e79a4f2 +DIST thunderbird-68.0-hu.xpi 618159 BLAKE2B d215510661fbfc91345e3a4fab6bc97b22f2cc980c8b121c7403f2ecbaef75e9036f962316f0f4d1ff5afba20faac95f7e1efb205532bb6e25bc3d558b145cab SHA512 4da44d0f54ab8832e8eb5b4484fc06fb3bce0588fd0a4a01ebcc8f42f44c2600df368c7b9a7ecd55fb0473e6f1ce91fd26b6e6cf82f62d6f34c96345b4139027 +DIST thunderbird-68.0-hy-AM.xpi 630527 BLAKE2B fd238ef369849e74a4302dfd9835d9cfc7a9086182d2f06597a34a54b25d15b433b6f29472df25c638ba7722b597115f56f08b604c1e56354d07e6f0d1a0acdc SHA512 1884f9a7ee6ca9b5fd3104b446bc1779a5021de275ca245a7796dda487622ffb35f92b3693a48bcc9983bb79a82be700878546aa5321e29e7aaa7d63cb63362e +DIST thunderbird-68.0-id.xpi 567750 BLAKE2B 829b7d86b6a7f486a0500fb76d8fe20a7de1e4e18cf2b817bdd23c6b3b26c3b518fb647c7d983be3812c59427700c1cabd1761a7c1428f8c3400dcc98d4eeb9e SHA512 e154cddeb48cbbbe090f42ae5fea785bca4086b753b6eecb958568a30c7970c761d672b164c970f2b06e6c446da34e5a70935e54c3886195b946b6c66dc1aac7 +DIST thunderbird-68.0-is.xpi 575444 BLAKE2B e1469a504c02d13c0229146c5e95dc411c7881a2dd73e3b83b32872526a8ced983e4c41f08efba7ca193027b9c4e3ef85e836303ddd889b35a87c676c654609a SHA512 e7fa884cea521f95f70840ab1e5c01ef0ae73c8c352b8201df95182864f2fb467dede7c1de5b8ee8a4b09212b1581f4e52fcc608e6463b581af0976a35c9685d +DIST thunderbird-68.0-it.xpi 489522 BLAKE2B b48cf65017df7a97576d58e69c89e22e5d4b919a167a7cb11c942511150ae96fb7727e74ae053ce8192b93173c655ebd9d11c5befe331266d0b9ff48dd0f3eb9 SHA512 2242f359661904027afad7ca3edaa0af3e7ba2737b4e7a217efae55d3d7caae629dcd913945ae417de04197e70bc121370ddc92e11fd888dc57977ae803fde2d +DIST thunderbird-68.0-ja.xpi 643578 BLAKE2B 86ea1d5494d69d5bf5c9ef33baf627c807f15b3da5fef79ade76a320e42bd163d2bf26bac8c3b58e103b4b68e5f729f281cc0a898a073e300069c26bc07b76bf SHA512 cbbf432c8f0eef14bd30d080187ed366c391ce98b963a7f413c2bcbf816a4c032c73daedd061cfde8088e6b8538a5286d74464762d56bfe709f737b4622dc277 +DIST thunderbird-68.0-ko.xpi 620532 BLAKE2B 640c4a4718e9fb75e4e57e48cc72e3ea69a59d45cb2755aeed44503bee1a6727615eeb06f46dec8aa10e98fb3a1ed27e70fc2b8b8e3bf47f342640c7b0c6ed64 SHA512 44b3714893997448cd6cb08793af861a434f1aedd9b52ff5ad4b461634fc8506958b2b4721cec906b623de91cd3fb948500f7d4633878c0331b7f98b529d4242 +DIST thunderbird-68.0-lt.xpi 603849 BLAKE2B f3ba5e2f40a4d4e1ed6819559248f65cd738fa35db56a3ca24eaa5a32721867abb28a16d61c1087f3397a8a63c01830cc1d35c0ce51d1487fb4d581241ddc7e1 SHA512 43cdc2e96c2d4897274c7e54efd64bb0ffc13f0ef7cd782937426df3f6f60d6bf45ec1f8e1f5a474b946c3a5c7e3ce055dae4d7526cc2462178d1f3f474145de +DIST thunderbird-68.0-nb-NO.xpi 574024 BLAKE2B 95b409936005b7d94a3c1c54ea6b3032e47d4ffbee731b06e1dddee9e0077e4eded55ab3b76e1cfde619a6e4aed586a7f396c85db2026c358a1240f81f332320 SHA512 9dbf9ef59a3366d6901a30ef6511e41e32cb37d507c8867128394028f06f69fbd85de5d3fd7a1a3b1a18e60a40d91d66f569fcfa33c28f3de42f4a402a148e9d +DIST thunderbird-68.0-nl.xpi 581358 BLAKE2B 35d574bbcb2348dcd864a9035d63189b0b5c6bca22b6123d04a234b7ee74a1542b80e9317aaaa83056ee435829284fd006d102ada8482bbd438721d55b29a203 SHA512 d421b341edda4a6fca9907df21a86a69d69f8c67a74fa8ccfa6eb9ed12971ffaca17ef28ce9002888d7dbccb99b29312a53277e29fab080009a0ebc0a67d4399 +DIST thunderbird-68.0-nn-NO.xpi 574952 BLAKE2B 15be15620ffbf34bf2149d1ebf9f7fa539478253a0ce06234cc011a5076efa4cd70f6739997cc131e300657bea2c91e9b4399b136da712ddebd1eb0f4cb81cbf SHA512 f2eb82d0364883d683e99c1fbc8d31ff7275d72a439859eb51b6e190c3411333f0102736ee206547d9578d4e6aa33f9ac7843c0b18ed2d4e1bb52cb5b4aa37fa +DIST thunderbird-68.0-pl.xpi 576090 BLAKE2B aad0754f3e0d7ea994f71e46160d71bd54573a0765dc5978022f6255eb3f04cf28ec1ce7eafb2450c9fcfae3c0bb1897afb85459da9febfc6770458ff8421223 SHA512 73d931350b429fa61b822ec19fd169abeefbbf66dc496e2cc694763e28c2f3264996ca07deaf6819f91cc08e3fc11377e1a67dd98df5de2fcdc2e0ef053f35b0 +DIST thunderbird-68.0-pt-BR.xpi 589839 BLAKE2B 65402956dc9b102716c1ef7ffd2fdd9ac1236aa85aca8e5765fc8c720ae34b0bdab98077dc42fe1a6560c67fec5a06d62283b89217c1e5ff3c5fac2100e94313 SHA512 7a0d71960eb5d23bb1f5979d321c463cfcf8ebce5b60fc370e922468e8d3d4e95230549b447c32e70d75d39aa1a5b4ea2d793f423e1da8dc62a9a2be54796701 +DIST thunderbird-68.0-pt-PT.xpi 588106 BLAKE2B 741c7b0bedd2219bd8c274d1a192624c107344a0e8ce77c0f7a9f20db30d58a4519502cec617119d5fedd9ba1b47a2bd692762841c1654ab0bac28c314378aad SHA512 483d732c54bf516b9b06cdfaa48c246799ffa8cdb1dfb1fe67231a83abd0d2e5f5470133528f1fd297e6d961cff98404f6db3701bf48c48d25be7517e4965f0f +DIST thunderbird-68.0-rm.xpi 578053 BLAKE2B 0864fd59d6a96a17f486a5570d69ea7e933e11225415357d02b11d01d3cfd24e9d627b312913fbb8a276d59aa504b875e1fdbfff987cf1ff8619ba74ee13484f SHA512 1bbe684e3a696103190d926dc1ec1e27453911b7267c36b87f615f1c97d6720513320f90992c48cd1293f37fd009f338da6c6832b49b0597af97d928058271c8 +DIST thunderbird-68.0-ro.xpi 594844 BLAKE2B a6ecaafcde838a1f2a6e33cfadc5f8bf2f6c873740677b9e0de75ee9c3b0b973f806407857ea27876f57149b1d7aadec31a9bb3216dfa494be52851c2ba66d1b SHA512 fa8c7e41fa9e15e2bb248fb2960221d3b5c45aae1e094593e7f7b03645d1a85d93de2d46002a2cf31a487e0d25079905372acbf22f9484bfe747a26ca90724f2 +DIST thunderbird-68.0-ru.xpi 683329 BLAKE2B 17b19ec36e586d4c515bd86a2dfa3041b5d6ddbe64c1e45d252eeecc9693bf6b70855f750960231eb2bef64e3a5f944b24f414f967634bc6c7b4024bdca293ab SHA512 ab70a04185bbcef1722bc6ac127289acce4bc6410c7732d3fe653d35d3a23b14eed9c51feed317efec47ffb5e8e560c3faa80550043beddff94be90c8be9ad9d +DIST thunderbird-68.0-si.xpi 637408 BLAKE2B 5bd47ea8a09a76cb2aaf58e1e9acde919dad7de34cc86989cfe054689e13514f027061c36d2bf27122875db4c0406e759b72a8bd9117637af1bf60cfb6c6ee1a SHA512 1eb0f6728c205faee0c5e88c3801eda8f35a03e0fd5c20b7fbfa6c29aa2f804ef1d157342c17666b086c33305dbf53b706144b26b4172d6e8c91c782037f0d47 +DIST thunderbird-68.0-sk.xpi 609756 BLAKE2B 20d73444d2ae0abb41561cafff118a5a00451b7b52848c102801f9d4a860a8959ce969bf5ff1bea1e82dd909d2b853b2406d03742580ff2d74e684c00e25b137 SHA512 53f2fd7c22ee9381b38fa75290c65c57a452335944cb13cf710c064811207af2ffdbd11177f378d0cab6a5a5ac4ee3709b427f1c42b09ba3931bd73a3d503526 +DIST thunderbird-68.0-sl.xpi 590632 BLAKE2B 1cf13e500189398ce3bbaa495c0c1c69ed23443ec3fe3f96598ff3fd54b576715ca2d2c5691ac0c279b417effa1e4a477170ade32169ca93d932223642bf4a75 SHA512 b47d6ca7e6e110447e76f90d5e0d7ed23533da369a74578bb664c8a25539e4fd8583747fd4efa8ffafcfa5a01b2ed9c66c5a152fdd1f468ab2da00f6946078b6 +DIST thunderbird-68.0-sq.xpi 598904 BLAKE2B d34cda28594747e4a6ad699c071aebb599e3bb12bed97545dfb9baf3e852ec6c207e88dbfa553ab411e6d7ff5fc7b415c2f359e55102ef67e2fd42bed3422085 SHA512 7beafb5e1da2355866d4d14e38d6d0712fc6f10215a4923a941c1d1c775e79414b0ba58b647f79a4d36cf07c825d69e108d581c0ff2471a76500714499d9f57a +DIST thunderbird-68.0-sr.xpi 624900 BLAKE2B 86950081a0b20b1db3df4c140fcdf1e9fcc3cbf8cf1287942a889dc6e18ccdb71e60e738f1e8968c265484166aea1fc6dec1398ad6377ae53c7d7753c812381f SHA512 f6b925a53e37ab50431a0062dd53171a1e59c5927c82706eea337d9eb7f3b03090bc383b1b8da5dddbbc67e3677962c0b1d79196ad839af7e7aa56cec73ea44f +DIST thunderbird-68.0-sv-SE.xpi 591599 BLAKE2B c9ad5ffb39cca198da8b9ad3c9599c0be400d0eae6901c4acb82b9c71472ca78e4765fed1f85d2c1ea74fdcdd24670dce8340c392f1c71463e076566ee0c686c SHA512 24834d4e6a8badc3a4edf5d93e5a83249b96fff3cc9b918eae06c99457ae9ee399a2ac479ef3ab0cabb4d06dca44e56576913162dce643f725ecb051b5b6f283 +DIST thunderbird-68.0-tr.xpi 599711 BLAKE2B bb852ad1127ba445fd5f64f6b2cc90723cfc10a396915a73fc2c297872720abd9a166a6a24993fc08b5eb0d4ccfc8905e374886a13040e151e65e7921c584373 SHA512 83bcec20d0a137f5a7f480bfe3b05d32549fa7a4e07b449d96023a7b6b0b8a7e87ee0202de2a6e6b77e825ce048b021f27a243f7a8f6bce09fb0a8bd6dcc8306 +DIST thunderbird-68.0-uk.xpi 671458 BLAKE2B bd66d58c1a0770e4d4453d8b5d305943aa5012d365b4520670ee61cad1b569945bde7540a5747f66d6ad9cd56f8499e1111d90d2666d91b9149e7f34653f6f9d SHA512 55330dbd8bce9cdef80a081ab7219991e30da74a4e68eb7447c9a01f6a07db9f7fb12d2a7a826767cb70c112274c36119c9fe77f7896af9e2e28211bfc75f0e5 +DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8bcdc8f0f8c9a809211824fb0340be7ed7587eeb0c7bff27ced9b06f7f084a46d0d25354f0d5ea905bd7562625d701 SHA512 4fa2b202881d45680da6fed5e3c9332b64c6aa539e6f19f4568f06ec0819e7157392270a4009db2e45ba9815ce696a87179b2709839d68236405e88542892857 +DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d +DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f +DIST thunderbird-68.1.0-ar.xpi 617169 BLAKE2B f2c052345364bcf33f47c8924d2442c891ecc2fe0a17b3675f97dee18e38d18d139768010a80a69de7d45ccf31c328a50146d8dc2ae67051eadbe34d889db68f SHA512 ddeb1671822f4081e644dbef3e6ebb3ea1d48a0390eed1fcc7ad99ffba4cf00b916c661e74e87e07faf614c9e7226a385825f2eb9ab676058d20b6c560ee42b7 +DIST thunderbird-68.1.0-ast.xpi 551302 BLAKE2B 25a2cbd819dd587e27a3b9460f52f9b6b730b0d6f7f10688729ceb1aaa69d1f2e3a5fc93ac3387061ee2de4734f27246d958cd0c1ae235b38e53d8a772123e42 SHA512 c43d209b55af877bef377f109a387fd409fb2a04e0eb39f3453679d159aaa04ab4e68b97e4dc9eea55da8ecbd7adbfc6f7551c94c2421d9273903029b77d83d5 +DIST thunderbird-68.1.0-be.xpi 646281 BLAKE2B 1b977ba362d5636b7ba102510c9e0fd881f5c822fcb8ac71f348af0e4576d7cfeb23dd41e39bcc3cdd806e8c95008c3175a440a39b06d532f9cddd77ebebfa06 SHA512 e01e19e92b43380076467c26bd2c015c91402c8dd8f823ba05b5184d91c4f91d3d228918c812e06f08e174c798f0df0cc6f683bc4a43460ad52eb5a82417a810 +DIST thunderbird-68.1.0-bg.xpi 646229 BLAKE2B 68112d2c182b9c05db30a1c103dc172e2a1e99ffe19dce1600f78ab29ac64940731b8c4eaa2d1bc7cf343d1d7b9a76e8cbcee05667d2177f6df8ce262d949d3f SHA512 af3f4075c95ad4dd26ff973e411d58df18b81a1a9443db2816517149c95641108921ab495577c1a459039f4062ac62b21ab8176e23bda415b5fcd895e42d5ec9 +DIST thunderbird-68.1.0-br.xpi 574853 BLAKE2B b6f1d8f102d7fb4c4f2a2733f4549dfa9148ab745790b018f24ae0bb8287f3ea3742e04571c6c800d3b4ab8f3298687816c5ec62571878915b0162fab095edac SHA512 b4a11a85f641ce6c19819287e71d1bc4da841e579e8662041d5f634156022a1e845c9f07530a1f56a2e3d957e446b98f5009f248d0cefee2a13cc70057d57906 +DIST thunderbird-68.1.0-ca.xpi 578441 BLAKE2B 846ce092dbf1c8dcc6eaeb2ac158971aa1bed34492dc1f567f8b1c7542baa1b7e028903ce81de11719e945433b346d8446de34b0f618760c1e6a494e6ce3ad0b SHA512 4069e41ef89bd77e175a7860ea5af914cc4931122b0f3357a31c0dd6a62f5d3fbe976fae6c89cebd94c481c0113e18e644eee74081833008bc017cb66785bb95 +DIST thunderbird-68.1.0-cs.xpi 603045 BLAKE2B 7b51ed3f0b84c9a3536c6bcece686885b28393734ad20ad389ba5649501db9ee219ae872c284b9737cf7509f1561dc0ab15f60bab2dcea4189c93759aa6c1842 SHA512 a68b0227d748dd67b7e0e85de489c9973914a6ac3d859ae766f67761b6c80827ed7ae57fdb2cc222c5da25ef901cd9b17e1cba8723ea7143b76b49e9397d3501 +DIST thunderbird-68.1.0-cy.xpi 589905 BLAKE2B b9eba3068f38a64e66ba175cb1ea61e2fa85c9ce9f82cca643745ccf974c4abf21f0aeb041714ea3d13dad2df70629557429ba6efd60add804dab03a6d60b8f1 SHA512 6bb69e2dcec1aadc635cbc2b1e904e7a75bb7e0348f6cccf185e3df605cafe44d04c0577535dd79896c3ade3524ba7946cd9c204d992a118a5bdc8097c88a0d7 +DIST thunderbird-68.1.0-da.xpi 588352 BLAKE2B f398b905834486c26358b615076d6b8a1818a966f9ddae60542dee97c1c0204284614adeebf337d65886ddc1796113e51ce279ebc11b38bfd7baf75cc845be39 SHA512 75768a064d16e8e9cb5c43d59c4b8df5870d94c92cbbff6161d065111872489c14c010b03427c3f99556365a7c284fd8b804904468fca1862225b21f88f7ae60 +DIST thunderbird-68.1.0-de.xpi 597806 BLAKE2B 3ef6c05315259ee073324bd703827dbd58c310b2ae74fa8584d33fa61fab76194f339d90a7c795b83a276801b6463c5bf6d83a0a84b9743a93ed65d102d44f1e SHA512 9bd399c527228008886b2916a58e1c5cef35faa86309737ea079a0225ce6b6f431adf7ca3f3de1f77daa0013e5ffe97b3c93c1038c6696cd8f079404e8459083 +DIST thunderbird-68.1.0-el.xpi 699223 BLAKE2B a7a5eda069bf7b14dd58dce9864e31722f45f2dc1ac076d699a369335491e83058024e6cb94c116a9f8551cc96176ca7820b2ac732505b0621888d659f4faeca SHA512 54199d2ea585ae213722035e26b6afe67eeaa2676a8204cdc7a68b2e9b6d6dc3b678af0cb387e2992cb9d264c51e9cd938052764feedac0bc40d509197648f15 +DIST thunderbird-68.1.0-en-GB.xpi 556405 BLAKE2B 7eeb4b66407fac8b713aac3e6890c5e6d20bab7f8dd2ee103880b9362eda8ff82899a9c9fbd85f2fee7a38f2738f1933f22a0353157ca8abb90dc35db15ba2d0 SHA512 d918ccdce2631affc69c554c5a18b5d6c558f874bc85a23cf87bfff111b1176327d059a18a5a74f579b9b8e5ceeecc8b6545bf6c9653bbcf01f0f928cbb51956 +DIST thunderbird-68.1.0-es-AR.xpi 596554 BLAKE2B a451b27ac4a8eb177d016c376d683fcfe902b7a19a8cebe1be2e735777f907504b338e2d5cde42ee80aed63fd90fc7d5c2fe2f6c49c8652504f0d71c28ac00f8 SHA512 c7eaffdacd5fef01854afab2135df48a417c7ec0047aa639ab11a64a39f872556ae0ef39fdd07b4f969382436db258c471995fd7289673bcb6223c1a22135820 +DIST thunderbird-68.1.0-es-ES.xpi 518353 BLAKE2B 4cecac1c3abd80e31165bf8426ddd1709b868428f7a594475dc65683aed770a4d5539356794865956fd338ddcbb79c066af60ca286e15c69e30143bcc423e5fe SHA512 cba91ad6acfc7e42393a106313b42b2fc597594e68b82ec26bceabb4af2b9f9ad6953e87a74cee2181d013d4b2b7c699d1d1386052f6a8d90bca4f7ae30cda07 +DIST thunderbird-68.1.0-et.xpi 573582 BLAKE2B 0f41bf4c7206e8e01ec8b4e9109231a62aec05bfd8d3511d2228570b038fc0111d319eec754bf19fcdc0a2a3d2bab9848036a8a0abd75dd9e8c10377c3f1e4f1 SHA512 32bc624c0cc526f7be4e898a5b83ad7049e9ef7c1957f7077e770f9f967ea61fede3af30a1b4cf4cd1502889443e570cee97b3cdd026077b08b3ad04893a235c +DIST thunderbird-68.1.0-eu.xpi 579945 BLAKE2B 42ad1265a054d839ea403dd5273d21b20255a31d983a35b882c30bffcc0aac62b86a34f193c4d0692bca7cac55e6050713f9f285fb6772605bf49d9d1116773e SHA512 15cc36103fcf58a49f12664798211182aed97ea35dc4874694e6900138bc3ed2e2b423f5876a8a455a58e8677dcd5fd67f07432a0fd62ae39992b5f069f90d5c +DIST thunderbird-68.1.0-fi.xpi 578420 BLAKE2B 266de74e7a85d7a71d0ac74305ef6de1b930628de32610644718defdc1db25a7acb5fce716bbe11737c8adb9728ac3fcf5982c537c1bb3f8715924039785eaac SHA512 c6fadd61e6feceffae6180530318b35b3e5319dddc12074cfe727bc8fd9745ed03a92e7555e6daa99588bc9aa9bd731939af7151cec5c6083b736aa2f37275f6 +DIST thunderbird-68.1.0-fr.xpi 607812 BLAKE2B 131d735f828cc051861c604af50ffadf273e9744e3124bdde4036c1c4d2d9f6d68839f3a1bfcab8a910d557c522a8829cde070fb857fdab22bff0372d113f564 SHA512 2a86aa969828c30430d89dec23bb04e842bde87eb35d2ee6759eda07148efaa6a29e84ace654ab224dab34d5fa061a61172f41824643479934e10ad73cb9f209 +DIST thunderbird-68.1.0-fy-NL.xpi 594470 BLAKE2B fe9094febccd3f84182666e52be9718d012e4035308dc2b085abaa9558f85568b33c30b8f9049abe08016a151243c0a46fe71822dd1acdfa80eb6d6d442644f1 SHA512 6732b5bb3c18cae9c0021bc38d7a4b71c1ac8c266e0b06d7d83309a07d45f8e3da64672118e58e4c160d6a0b91916e0e52e505bec65327914c5342dab1bbc2d8 +DIST thunderbird-68.1.0-ga-IE.xpi 588711 BLAKE2B e132885a47c8d4877c7baad0dbd85b65a87746ee124877b71ceea8ee8de8c93c732b0165954b8ac18e5767f17507ef02614eded9200c81a0c079dd48bb363763 SHA512 cce49ce68eb7145e360fde34f88bd411ed9ffc70bfd7d0aad5f78bfa46d79ca3e1a52c6b036f4affebd1477818199ac6ef2f515640ca2e646c45f1fe1896930b +DIST thunderbird-68.1.0-gd.xpi 587112 BLAKE2B 868bac6b84d91729d0291cb22abbca5306c94b96e49fc0dad738e7f30ffcdeffa9939c520aba9cf38c4ed6bb080458db6104fcfd1d63d5ff3f9342e51461dbcb SHA512 501c39c75fae95eb688d85f28c2b5993afa9d645354e402d82041f578f92039134cad6ee74a21fc48562b7271bfb58e87d565108c3c65fda1611772a5f1f0270 +DIST thunderbird-68.1.0-gl.xpi 568399 BLAKE2B 6d8812bf4e7e1cb97578690ff1d9e54326a572360c9298fdde71ff82b9d18d9a2559da0dab449527d69c960ebf33ff5c65b3bd01b23528f52b9a537728ee6ae3 SHA512 25bb290e5e25d85333c114b95c5f62e3c2cd8f1a9c1bbb180f234be1933754a8e4511166e314486c3899df1269ae3e58f737312dfcb484dced8e8561b8f15768 +DIST thunderbird-68.1.0-he.xpi 604790 BLAKE2B 8894a405cf308d58e24d033ec375e96a200040145380c6b999394c1d1a67bab89281c947e5bcc218e1de6d9b7133c92f2062e180c1766629189aa8ebaa7f2a2a SHA512 5fa36355c907cd1eefdc473ba68294fe5cf8214dab6d3f0c603333e7a15ebd17be61f5206c871546c8cce7e74acabc6ed415b0f319f03bc8ff1355399280deaa +DIST thunderbird-68.1.0-hr.xpi 583784 BLAKE2B f425f09a95b3cfaac01a66ed514803cb892cfe692d38c94878eed63dc2791c3248528077f459c53211b289be69db9bf85adb916ab986fb964f2d4eb6eb1a6a51 SHA512 277eb466c6a22f9e2639802481bebb5088eed77f50725983125bd2d470aaccd36ee52247c8f261ab14282b171938e994bac459fede6fc7f0af4cfa7ed25988f9 +DIST thunderbird-68.1.0-hsb.xpi 616037 BLAKE2B 5fc6f21fcca7fad7c491ce2d7f8bd97a08e3791e062c3c6020df80cdfc9b549f60f76b7ff03eb6f6caf1c119da10285a880781127e8ff73fbc69e3a6a016dc6d SHA512 0e978f5cc7f5f5f8737d8e4ed2b917dd77e69f337a12feb0d8a8b24c8eb5baaa55e1d0225473a4ffd802c701e6bd5674160e7b5ef7801f35cb0d78e39c9a5dd5 +DIST thunderbird-68.1.0-hu.xpi 618155 BLAKE2B 1a4d1cf8ec29eb4eac0f24470eae945dc6e3bdd0bff4f84bd2de8eca522e752ba157fc85cdaab1ed9a8a18cd64908bcca93cc74571d61ef1e5e7a2986ec3e6bb SHA512 adadfca956bd3e29c260e70498318e748d5309f84a63d2cf392b124b362bd5e1188a2dcfb8302c2e44a47abf2240067db40d1a05fb7c3c8f4ea8649647169461 +DIST thunderbird-68.1.0-hy-AM.xpi 630527 BLAKE2B 25b8d2c0acb8dd099a111143735c0e25f8c9e68f53b258ef2212dd2bb336caf5328578f61fd00b84c100fb847ca5892975340b5fa840487dde16dee08de6525f SHA512 32ba837e14145b8348d132bac7178ab30f4979600157c57f621e18f85d727cf34dc4fedd5f363b6085371c657a45d39c5a73eae88ac55f46bd68ea84ff89bdba +DIST thunderbird-68.1.0-id.xpi 567749 BLAKE2B 1fd32cfc990c3886ba5deebce62495655bd501349134b94db48c47825c8b0c7056e082674bff3dfb541d3e0c3cab7a2181fee850f410dc38c8fcd0748bacdde3 SHA512 f0790b6dc0753b6bf6774568e9ae688f2f664b85776e2e98c2c7982d6f029142330f85a6070480b216fac4d5b114dadeb8b03e7afa6f71a37a0ce894861c6dbe +DIST thunderbird-68.1.0-is.xpi 575442 BLAKE2B 6d5ba555b30913c15da817a7803b82de19cd43d6d5a853e077eb1922927c6ce6a9f3067f48cbae5592e45dd071dacabb0ae50577f789b31dc5bc76680e61e33a SHA512 dba89e9f575603ce819e7a35c31a890499d289a34e4d26ee336fc10e12390295f00950b796ad9fad273788757168e67c74fef21e034f3ff350095b7f6788bd2b +DIST thunderbird-68.1.0-it.xpi 489522 BLAKE2B dc98233f8cffa4c60bd384fd67f52a77795fe8628d29f12db04744b421a802f2d158e59e0ae4fe0a45d1fe0b69bdb0ba5f9561b0a498f91ee397e592918f0bdd SHA512 42a30ee490fac970f64b36ff49678bffff1c6936217c791eb63aa0a5c65995090e08c91799e8991cd6293cb65b53649bb2e7d380934d22855d9d7a3af286e8d1 +DIST thunderbird-68.1.0-ja.xpi 643575 BLAKE2B 38098e5be3826ac22aa5bcbbcbbdab85b46afbba9207f26d6f37d769fb6b0e642026de3f7cd7dae14475553456d8b615429a92f6f9bede07a268687db6288ab6 SHA512 aa907bfec130efcc49eabf0d5e2a44614a297be644f4c7c70a5eb0af3371381996549d86c752b866c42136bfa5ef53bf82fe0c0d673f5748d2bfc24567544752 +DIST thunderbird-68.1.0-ko.xpi 620532 BLAKE2B fb381e0cd1c995af77fa787c2092dad87863aa97ff23d1f36b9d91db55e92a58eb65a9663451ab6af89c8b69188671bb1276612b8feeff66f9deba1d0f580cb0 SHA512 d38316178643cc32e98bd0e0349db22950742c7cbe1958b26d885e67da21b9826d4d5b3f54007985d8aadc4efad7c1cfa86dd0dff230036b9535664fc0f38905 +DIST thunderbird-68.1.0-lt.xpi 603848 BLAKE2B 502083b480c4239952a42c0b7300c9e688c163394a4cfea4ba9cbc6a009759cfdf09193e6cd1f205f24e06b2e8eee23e6a7948d4748e9d26db23dfae1d025e41 SHA512 6cc4a83f09a406f797d012c53fac311cb4e8fa1a9d01e9f9439f229a2ec1b02ea87c48d75b9d2092335090f98379a3bdafc383f8b3608393d33479b077773ef2 +DIST thunderbird-68.1.0-nb-NO.xpi 574023 BLAKE2B 2b9521973dc54f121da43ae1de8e27ad3ebb89d1fcabe4b1a29e9a370a6c5cee30f44c5baac9d189b4a3c0b92a097871aeb413a490519210d32e5d4d34f2c9d3 SHA512 cf40bc431860dc18969c68305467ef46682cc968e5ad7f3d41cdeeefbb1b588fdf81c06a971e696ca76f87051da3c0199d80637801af971d350ed71d3333d0cb +DIST thunderbird-68.1.0-nl.xpi 581355 BLAKE2B dc32f6dfaac88a741558c0c5c335bfe68fc81793415d59dfd2e69760829f916a603667d7db6ade7a2da4df1877e9b135dbc1d2da129a24cc604d70b7ca45495d SHA512 9d0b86fcb86d0a6626f07ed2c75ad84aba6829637ef3a590e549914acb1d615581fa46d46dc0ca6afd7079dcaadf17712e9f5a1904b0bd54c3eb7ef486bda4d6 +DIST thunderbird-68.1.0-nn-NO.xpi 574948 BLAKE2B 7fe72d1ee1d7eb90dc85b8ed0929e28c8645fd5c8673ccca41de0db9aba3989a6568b111d556517075ac8ef31cd173a214b9cbbf8a65ae786e7ac6d06201ce15 SHA512 0ce857987c1b3de4e5d58c12aa5c4740f706217bd0086b7e8e97a342b1ba41ebec57564c7d7d64cd9fd7985cfb0083bcacaf151ec5f8f679d668ae63212600e8 +DIST thunderbird-68.1.0-pl.xpi 576087 BLAKE2B 7000e10cd0c5be8017fea6a6419c7216a76a407de6dea9d0d2b342f6e2c8ee7f569a1b89417dd7f3ce31790d802b95f04aabc22875d20b805662dc77cd1a6d81 SHA512 b5d871f7e41c7fb9786abe92fae62a07a8f7535e349a231892c9f96f2cef93981a01dfe0afcb64f6a9a0486d4946ddb6817f58793be8394aacd600da1546339a +DIST thunderbird-68.1.0-pt-BR.xpi 589838 BLAKE2B e9f0cfb6ceaf8bff5fa3a41b68a5a4bb8f6c1d5531af6870d28a9e9ed5e2ec3ab9b197a7366e044eae7c2c386a1a788fca9389fae421032cae5521cabe5ffd9a SHA512 23c54db7c1ecf776339d890b19e60c5ccc34ac3e7b951b783f32b2596eee3e1d94cfaf8b0524a68c123503cda147abddf2e5370026c261c87660568a1e0dc518 +DIST thunderbird-68.1.0-pt-PT.xpi 588105 BLAKE2B a997dc08cff42faa5607c9acd8cf4ba3c3caf3be137839f68a40c0eb2719bc97cb34fd64b661bb4cd00f9ea172d1f07d08e7582efe08e49d3553274a1c113939 SHA512 c0df20c77b1a811157a416f2e394a7c11ac7543d2eb423bc7b5e0cd51753258a8d12b58eac84fdeeac3867faa9ab9b0a490d33cf84277691ea4f1acaf7f4e89c +DIST thunderbird-68.1.0-rm.xpi 578052 BLAKE2B 42347c322cbd54a4eb7fdc0554c0cfa9f97f836b1265d82d733cd3251aa3fdaaa9632630fe459be03e9b8c21e12cc9a4ebd77fd3c17d9ad148f8e7360862bd09 SHA512 0bcbb9b306f88abfba65c475bdc96be526963ecac686c7f0547da81a4c080746b94ad08b24af678982b1a202203be7e78bb069ac684bdaffd4c011b31d8add41 +DIST thunderbird-68.1.0-ro.xpi 594843 BLAKE2B 3c94b1984e647dc52b462411e4c072a0b1150900be582d3a2609edd63833550257b2c35f2a4ee6877a73eca52016841e13dd4d52a789a59102672958045a9be8 SHA512 027831d7b2ee8f333072b240007c90bfbf1ed2587f76ef4835732d245bdaf2eb440e289a5f421e2cb36b5ed7838d89a5c65424411d5e9d9e41d390099a79c9dc +DIST thunderbird-68.1.0-ru.xpi 683326 BLAKE2B cf4892f2c3b7fb2e42c6a15c6b542c6232c435c8630c4eac4caf7284f0b19fc74b5f323ee49af73e34463da2ac620a860a047151afdb5ac1d33a3fc4a01c60ad SHA512 3464b6043bc6c4b615ec97c0182d5db1b18d2dd2cdebba189f3afd6ae819180de0601dd0d12236e2c41707accfbabacd70cfb9b27dbc26c59ae0541254578d10 +DIST thunderbird-68.1.0-si.xpi 637407 BLAKE2B 1fe283e54c90ad1dc981b9eed3de04950d5b170777fa5eb4f0449d1bd436da18600457551e9729621d74161f26a611dba98df7a62f44d169df59723e7a57f2e1 SHA512 5f4ed5f27d8561d0e9301115ad93970608486b688fd4c35fb02a1a4d8c3eadeddb66db4ead3afa61e94920885b1bde3793e97d503b718a9eac7829e920bff055 +DIST thunderbird-68.1.0-sk.xpi 609755 BLAKE2B f017a9d54396befb3fc40470cf82eee753dff009823ef3292ab2be1b14f95a33963fd58027a247a8ccf796c281241e2c0052ae5ede42f6cef380512777c059df SHA512 ff87a93690e0bdeab82d99bfedebbe940498a4e1ac4e473de42b5cd1a381d4966eaf937060e64bb968ad4fb05753fd29a12986f03ceb61b7ea1837e8b111ab48 +DIST thunderbird-68.1.0-sl.xpi 590631 BLAKE2B 14fa8a630abc0fba63173dc70fc97300e09b314debac5b340e627ac45cfcb11eef650876ae9f3f0922b0160d344cc3d2833fce8e732bd5809e95af74bca324f2 SHA512 4a346553f14dfc0aef74e73ca8ff247eaef2eac444bc6e7705485806aa6c098432918e8a13461d0d2eaaa44add51d88c77e4fbfca699bf2dc417a5283c250ace +DIST thunderbird-68.1.0-sq.xpi 598902 BLAKE2B 09247b404a189fcfbe88afea6ff35a3f47bea9f1d318b6a5a829ab5fd48c05565c0efa60100ca1c1feb9b5e5f100d058f0c52c796cd2fa22366f7c729351fe92 SHA512 08a4e32481b608d191075f1dd02e67d505300facd2d652e57da70bd79b11ac7e448c7b84f183b1b05e549be9e56e974d6d58f7827456306d0079414fab7f042a +DIST thunderbird-68.1.0-sr.xpi 624898 BLAKE2B 6a1c707d19251f53d32b1655bc429fff9404dddffb385a07f5c0e6432b5de0aa11780618433dfd09af435738bfd5145778c90c2d34f30259a3ba22b578a44785 SHA512 147eabefe4ee72653e49b5a2390f3283f1b527d0f4f89f967771457807f9fa9500c0b953fe0473df85facf9c925826df6ffe46703c37b7726a30ca96a863e550 +DIST thunderbird-68.1.0-sv-SE.xpi 591599 BLAKE2B 15f4cdd4e0e620c8f9d19e9e537e0498b8a65a3fc06ca8a675ecec75cccb345211f00b228fdc42ee536cb4a4e9d0ff10bdc343741014ae70a93e1ca0e2363efe SHA512 346efb8e4df9ca17241000bcebf1ce70e4efedb37d59c081725402ea86ef405543d3d237a434987606b927fa24e93d5330e7c427f6db1fd27c3ed000d08cdda6 +DIST thunderbird-68.1.0-tr.xpi 599709 BLAKE2B 1e3636ec0900cb65c23bdc56c40bce2c3ec8548d8dce4e2039ace53140fb8f4b35c7b5487729ece0d1bf0a2e39e95e9d77d2a8c9314f9ffafb36fb5a115b2dd1 SHA512 9d53788495096fe5567caee9110e7c7df9333cf7330705768895730adf18f83ba53c10dd621cd5e99330d79c58cb05b64917858f65685805a91b1cc33377e0fe +DIST thunderbird-68.1.0-uk.xpi 671454 BLAKE2B cb0d130d35bf3f9d249c04dac2c84f056bd32ae1d50f7287b6a9a5642414d92f7bcb88ca31d33c3f48f409c7d336da10a040247bbdd1de25143bd35aaa4006cd SHA512 e80cf803c794114110dd6477d5d57cad5166a20ece54c86465d105e69b733b9b086fbe66c506dd2484040d74b5d92fb921a8bda3d88599b9ceff3f77c20300a8 +DIST thunderbird-68.1.0-vi.xpi 623424 BLAKE2B 727c003698a48314b735c7aeab8097966bf4d5f876aed7716b908eb7d78d6230bcaab5e9515c609232d92ae50c23fac413c82de946ea608d243231d6ac82e281 SHA512 0a71b075d23e5751e38aebd4a855c1842b515c2ce9ad52ff39f668ad97f709f2a59cb8c32d5e00f54627473afad6a882ecd4eb3164c754c3811b1cc4f579b4e0 +DIST thunderbird-68.1.0-zh-CN.xpi 626821 BLAKE2B 18e4d225bdd0b765d7f9c1a5351c9978ef515d26682c1d209f9c2e272363dc3d5f0d49df88c97f869ad2042d2b51f940e65bb8f7897cbccc29b38e8ecfc53cec SHA512 64b6098dea658bb422037014a9f1ecba5673f7297e98fc86e1c2e5dd8a85bad21d1a6c609b69db88886d048453460d910363d3c3000aa22432924b45466d1d46 +DIST thunderbird-68.1.0-zh-TW.xpi 627477 BLAKE2B ff3b76ddbdffefcb7c75c185812eef137e66ed370f819d94372696004e702d9f18aa370df5a51217fe24bb7eb705614606052dae30a58d10ca9d2a6ee5ceaeff SHA512 5d4fe1509272f1c0a4d857d6cb44eb6d6fa4d3c8f2e573d0200f39ce1de937f53438a2defe194b397104c49adb92991a20324cb0a79baa7e4f74a791cbffd955 +DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78 +DIST thunderbird-bin_i686-60.8.0.tar.bz2 52674194 BLAKE2B 06ecf87d3788db44a2d15de33e64fbb5c4ea530c4d638167e6e1e01543c349c36a6d9160c98509c9fceaf38719206780100053e83d837454da46e027b774dc0d SHA512 5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa +DIST thunderbird-bin_i686-60.9.0.tar.bz2 52847155 BLAKE2B 2288039c6f5478a5e7ed78a1dd18164ac7203dc380bcb2b69c2aca7eb73cba0115e5eb4d9b12c7ccb2de6a352f3927cd7a8d4b1769a17d9d1c681e8d4451c577 SHA512 b5e3a7d7df69f788408b9d83b05d45c6f8464e9930416d6feaf70a5da58d464b71993b6891d77969537a1f806227565096d2649e19b87bf46ce81550cf7f59fe +DIST thunderbird-bin_i686-68.0.tar.bz2 57137293 BLAKE2B 38c0cec86dfddc46c192faf93596f747ea827aba1ea685757c53c42766e974430886486ec1eb4bda73e8a880e3cb6a7ee6548adf4c27b1630c662c270402c339 SHA512 6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19 +DIST thunderbird-bin_i686-68.1.0.tar.bz2 57122527 BLAKE2B c4be069e15eb7ccfdf8135d918f1907bcc13440a0d385efa9865af76d285cd776bf68a3af3524d635b872881286ce673052ce29b302b433d3cc5f7b424e9c5c0 SHA512 adc1dddf36116435b3948810cd9d647febfc97d62443032100b0f2d722913aa051d44244f057c29cb8c6cf494fc67b3044b83ebfd5eacbc36b6cd9c88361078e +DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7 +DIST thunderbird-bin_x86_64-60.8.0.tar.bz2 50477272 BLAKE2B 60c8c33d5eab011c6eeef44288d0a483927a0793818633fdaf5800beb6223a675c39b8a3a4c4bdca6f307ac5e47bde2bb672eb034c421092ba1188a9c6d4359d SHA512 c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea +DIST thunderbird-bin_x86_64-60.9.0.tar.bz2 50538647 BLAKE2B a045c4c982cd14f6b454e72f8036603dcbbee2203cffd1cf916bfc50c393e74030ea490b4acc1237feb9ea0368b1368888769fd500ef4f7a1868368547bf05df SHA512 0a490a7b7b02bf13b2a47e7c838b9e1dec7848f2f40445744f74ed3294fda0588c2ed6ee402f3722d0dfccd0a9df9ed3e38021807ff337be3f340ca85c96acfa +DIST thunderbird-bin_x86_64-68.0.tar.bz2 54593293 BLAKE2B c5975073a9fd4343dee9d1b4eec2e4b830d0107ed8e743349f4663f4ca83511215847c8865348575aeac2a47a8275de91e9ee1052b449c95e6dec08498e018a7 SHA512 257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7 +DIST thunderbird-bin_x86_64-68.1.0.tar.bz2 54551785 BLAKE2B 99429bcfd82bca0e31f222365afe7652798f29d416e8a34c4375ae343c0dba3dd4b230fd37dab8cacf91c3a953533c81d9b059cbd5e0974171d016eebe6d0d99 SHA512 7a29cf0a238e44a2051b53e5476bc8f622dffd088251b66d951ad6874fba5fba180f440c80c7d5ae154c688d3e29fcc6c889f0031d81a018b7fd1dfd53f112a5 +EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58 +EBUILD thunderbird-bin-60.8.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6 +EBUILD thunderbird-bin-60.9.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6 +EBUILD thunderbird-bin-68.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1 +EBUILD thunderbird-bin-68.1.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1 +======= DIST thunderbird-68.1.1-ar.xpi 617172 BLAKE2B 6f993edac7b6002602c28d42419ea94a7ffa8d8eca8b808dd904106c65cf1f3e20f9f5e69a605997be9b53dbbf8374f4120577ad7651c98332d40654cc1dd6b2 SHA512 fd40a8273777368ba6aec4f0bf6363cd223284fda5e56bd6611639bbfff1484313bde514c1f57c510b7d9cbbbca1995b7e802d2fdb769ce31d72be864efd60c9 DIST thunderbird-68.1.1-ast.xpi 551304 BLAKE2B 6c581a2b3b225924ea3c9dbf9dc1469510ad760ae98a11598f498b8c158f2db91787fef76081fa8ae302894bbafa335f934fcf4bd8b95a6b527c52698831c689 SHA512 5cc2b589d7b4f5c5e00e09323417271cf08d505e12fc3b76cb9686d433bb0e7f2c4615e5f0f9d99edccd156ac63eab210037bce306cc1adf91b624b1a0eb0c3f DIST thunderbird-68.1.1-be.xpi 646286 BLAKE2B e1c3650d6033b9d684c728cfdad6834a6bd6c65b9d54bb5d36dd953ed12633e9cc610567eb25551a21822e5138d4e9add70d39011b8c7b396ad534767ab46996 SHA512 473615b00eba96ad530625d945d1eb997fe6c63264d5d6cfa0c54a359aef3ea3d41ece726388cae52514006156419aecc986803fe62d0e90bbd0185f1b90e617 @@ -232,4 +355,5 @@ EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f0379 EBUILD thunderbird-bin-60.8.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6 EBUILD thunderbird-bin-60.9.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6 EBUILD thunderbird-bin-68.1.1.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1 +>>>>>>> next MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53 diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 6d52d58974b9..d52f574fb382 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -179,6 +179,121 @@ DIST thunderbird-60.9.0-vi.xpi 637210 BLAKE2B c48d8004d269350410fdfa2f5beb4ef6e3 DIST thunderbird-60.9.0-zh-CN.xpi 626309 BLAKE2B 81e2846b570804b0aeb2212107eae1ceeb55789a5d5fe07b4f9d40e43d6e78d2ff3319668958d2f2c28779e8c6d0693f2f61e0d761098ca73a4ab30b3748da18 SHA512 d82844d69ba20b220e88b6fd425ae355d1cc57c40405dc1dee6699454c87aa36031b1e9f08f85abfdcdf6371a529f0eee8b3b00bc8b7fe149383add59b9d8420 DIST thunderbird-60.9.0-zh-TW.xpi 626217 BLAKE2B c6739b670cda85e955b53a6edd704568c52eb38c00d69a2f222e8b991075071183d53e520dcd716d82826b6d9e0af4db2dc46a732790c71e5607f7f4c53067ef SHA512 efeb58ffdbd53e445a2427035f1857d2b02c763e6f75eac58652fa72560a74e4036ec65b2352ed4633d5f54a0b5aa4571f7a582ac2fc51a92d127ff126cdbafd DIST thunderbird-60.9.0.source.tar.xz 286400364 BLAKE2B 1de1557420b74fcde358e5c69a12c78ecbce4954359bda8dcdbce405582116ecd6cfad7aec09ff2d949c443ca6fbc06d84f315674a5577b978635af56ff13430 SHA512 f59d48fba7fb8a4bf7cb160e6ca2508312a7fce950c12f133206935bcdb4c9844a9cb063aa3aae67c82562d2a51e123cc1f5bbad0238a1e5ce386c514295bdd1 +<<<<<<< HEAD +DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908 +DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f +DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8 +DIST thunderbird-68.0-bg.xpi 646231 BLAKE2B 1bdf1354b9016f65427158b7cdc6a579fca36b2371b822c67a865fe00730a3d27382a2cc95714907b079d98d5c751d6e47c3e50e7213a3745805baa32648f342 SHA512 4dc0f6cb5d9000a6fb247dc838ad0aa78403ec1cd877343e44dd21b3a8538017a697ca17a56305e242e9a4e5b463ff90f97eab4dceac96b7944c42464642b96c +DIST thunderbird-68.0-br.xpi 574856 BLAKE2B 34beea12df59f89e4effc02e2cf80d4c1b6cf2bfc6295e8e0f978f5c50c2db3ef7607a5a9b5cd3729751c183628863f64c64c7ff2db9b9be085f2cf70b0608a2 SHA512 d7da4b12c55a0b5bf708c7ff1d479467fa66a2cc48e3478316b8137d4fd813bc479214a9a2b85633e886237dfa78330ee9ddd4ab8548939ad72cfb1aefee79e3 +DIST thunderbird-68.0-ca.xpi 578443 BLAKE2B 115c2a57bbe4a6c87310ac0bf23091db01e03428d8f3daf9c48b785abfca0533677927021d6731a42171f3d603f487708d7374e80025b9fccb744dc5f21a1066 SHA512 240fc2a770c70c8e86fe5b80efb8224d0ad7ab32df94da7ff995a0182a865d167d46410b0f2ac08569ad706340ca44d783e09d29716dac7ad19f21487b8f2f95 +DIST thunderbird-68.0-cs.xpi 603044 BLAKE2B b72472d609e23b5f1a1c77152daef006cd2813485240bd7350055a0a7f257becdd675b076d4a9365d997a80dc248c8ae2379a3ebaad1a0e0fb08aa790f47dd29 SHA512 2ad612175d867332907512aa3905bd4662d25c4ff2bd6d9b91ecdb5b4144f98dadd033dca289ec2e1ddbfc7ee381f2ee4e2eef6c0d1d1dee212a404333cdf8a4 +DIST thunderbird-68.0-cy.xpi 589906 BLAKE2B 822528f6a5600a62054397fcb0dbe6b1f544560160953de6ef7002e3400b899f648acecf3bc286359561222db6b7377da76cdabcbd3e4402cfd62b2c541d39fa SHA512 9981ad7b33a035d04d90fcdce7a537a08150671f6e81e2dccf61d2a6da213b2b1b7091ef93d80904dfd6cd7bbf978460f3f045384ae9cd5adbcdf747b434ce14 +DIST thunderbird-68.0-da.xpi 588353 BLAKE2B 8e45fd37b250e504f58094667704cf5c9d282943c64f8c2a2ee624eba0018b5a0c51897704ba6ce29a4ab3600fe89fb23528300415ce66b2f8d131f0631fa165 SHA512 1c210cebf73d21d59215a54e09b20ec08479e0c4058a92815c2e17c7f9713e3c6387f41194e2f562d3c7500a3e9cf0d0cadce5da83b972a51164a7334888b890 +DIST thunderbird-68.0-de.xpi 597808 BLAKE2B 64b275b262c402859e17b2a9caa7099349301a48d8c1370e3eaefcef46e4920933f98cdadcb8dfec4ede0881fd575fd7427a2e4a013a888cfe61c62c62b3732f SHA512 820a94b15c2cf1012739e44f6ff9c475ad60e67622931c696f0443d19892db2b697886452f0a9f9fba7d40611d5700ba602b8acdc6833122524e3aff0b05a976 +DIST thunderbird-68.0-el.xpi 699225 BLAKE2B e62dee23e0e92e087adbce7e37ee0e0f79f0ceaddbb0a701e78c17e7772fe611e0969f55614f049af10b688fc1ed2af4dc6d0aced35ea31bd1e3b045015dbfff SHA512 fa73410538d0576f596cc0595961183d81ff786f392a9a8dbaa8f269e16bbc968964be584d50d2170f18295c1b1a4a73514c7134a9d510e5cb2bbc662dc98659 +DIST thunderbird-68.0-en-GB.xpi 556407 BLAKE2B 764f6f0e8c81ccdbd5b1e2b362b18c2098b3dfe003afb9fc29f50cf6601d16cbf8d6823a62ee3795ee9a2fed593ed806d07d5c6ecdb373ae39534346d097211c SHA512 1bfe3e4ba5b7458656d96b9aff69c8bf33708f112616c87008081da5ef9c1295b224e828f5e738e1c729433ef2387ed8d9f09fcf4a479a86c73422dd50ae98a5 +DIST thunderbird-68.0-es-AR.xpi 596555 BLAKE2B 655546f97c74560c92071a5efb3c4c63328dbdf65951553fd4fc779c5f35f1865d5fe180e87991885f965444abeb3428c24a6f142baa38863fdbada4ef65929f SHA512 3b1e33d1f5bb76a0ea5f361f5d09624294eda230322bd350b1199e7d5ab691ce2a720e2c222bfc0244b537f695e8268529f69b5aeeab3ecdc356a7922e02a49c +DIST thunderbird-68.0-es-ES.xpi 518355 BLAKE2B 6a1157a67f667260b6ec5e16320f9b04793be1a2efacaeb516f96d26aa1e247a3e519ea6c1bfea860df4f33ad25c0ae4db969aaeca2ebafc2629dd3d5f415c74 SHA512 3d24445196608d307a6aa4df261c1d4a6473f2bfb82530bdafdd0203587dccb38443e056abb14d735bf9d5ec1e022dc58e0b595c23c4e197195fbd4985200a50 +DIST thunderbird-68.0-et.xpi 573585 BLAKE2B 7ec4dc001da15c653f34f6a809e8ff6f9714013130545843aea23b8daad96a2d910416aeb22e67585e01442de81f433762e3251fc9fc0133d3d4c0de3068d174 SHA512 f540fe0ceab68782c781e81a43d1a425bbcdfa1af49f24113b6b30933cf86e9be7b3e8c34983a5f20311da29f4be90058d07b90297c06d886bcb580ff52fa0b6 +DIST thunderbird-68.0-eu.xpi 579949 BLAKE2B 132bd384dc626a26786b45e3bdd67bac278f9d31d3edcc658c707b3981e94a00303a2a79f10632706fa3394447e4941d71dcbc7563f02a44b678fd9f3a4adce8 SHA512 e2472954fd3b309c182f4359d4e34b029008441f4ec17cde94dd6e3ce97bbfc7a3c523f54ad7bcec5df1a4c36fa3190c8908416b6353fa069c50ec59d28e0ff7 +DIST thunderbird-68.0-fi.xpi 578422 BLAKE2B db7598b706edf7f28399a72a6b30f2f4ca75a4ac4af4e775086f93c39baeb70abd782b41e2034263e962ec24249b5d7256e2ffbc149e3200501bc600c2ddb57b SHA512 f61565baebe3fe086faf3f77724a27d2494bef6dff6d2c3592559a86871104484807d9760283eb6864c92207ceb12bd8d93f699da71ebd9a6aaaa48b729e40e9 +DIST thunderbird-68.0-fr.xpi 607814 BLAKE2B 7a12719e8a8418218b19655d71ca6727628f3841ee7ca857ee3b48926321b29d234863742968e0dfd82f0740ec2a1e92cd1d0b77b230161372cabf1f76deee46 SHA512 8ee94e558cd2854d5d3548f8808b56f4a7c81c57183278b823702499ae186ea2a9ddf91d2a9bc6d0a3b5cf70464a2e5827e8e26daa14ce30623f75d0d324f018 +DIST thunderbird-68.0-fy-NL.xpi 594471 BLAKE2B 6f7f9e5a8692efbcd8f487829fbfa7c15d6f330fa5799375f64a4992b16da299902c5bb20277e557ee775ef4b8f8e87b3ebf29b6823dc13a2dbed11af725fe03 SHA512 aa43427cb603bc5deab2c13cc8565aecc8e2bc505961c527e5eab2406868c0f798876501c9e3960bdffdbe4e13b1936a4b18bc728efb9413c3c67e91c9850384 +DIST thunderbird-68.0-ga-IE.xpi 588714 BLAKE2B f02c68d432e10d17a497fb08657ede02bbc1ee1e8c34b9c33ea315667241b9f8878558ddf98b4f3398f1dc77042cf501288681b527d92faed2148b3e5070ed29 SHA512 d3a71503480f5116e5224a7f9d46d2c5e7a96e2ae9bcc72db264fd89aaf14f85e3dd901fe8258c3f3cfce3a3f5fe8c1c9682eef08908bbd075374b0a9c56cc50 +DIST thunderbird-68.0-gd.xpi 587113 BLAKE2B 80b223cf0e2ce8fa45fb0d1d58a83c729c70a2058c8e115acc9773080c65c42ee8a2fef83572749c89abfb4fd9b73ddf7c4f599cc42e6b125f7d7a0f62346fd6 SHA512 34325901aab83cf273529c0039b9b1b66efc020f1e5f627d7e4b7542bef4fa1ce1bf072ebecd018350d8243929b76bede698157286bd1766472b733950b3853d +DIST thunderbird-68.0-gl.xpi 568400 BLAKE2B 71c7dfd30cff2db1b8ae050bbe5e84dbf7af7bfdec7a344708ddcd08a9fd9af99c1970a3b38488593155c476e4c96172af389fc5f069157685a38cf89437c62f SHA512 0cce294684abe602884f39f06cdf9b757ce42424c1a85baaebbfaeb9db72d90f300706c3e1603d5fad147711d72c0b3e52295a4cd99145298bf3e71f94c0146f +DIST thunderbird-68.0-he.xpi 604792 BLAKE2B 70e298a02f0fdaf532ef460e902aa104d97f2cf379367693ad7ca6c4846267cc56c479a8e9418661a62602a89e9282e5623fafa629ba7bcd204e541ecf1644c6 SHA512 aad7763b63011161bee42d8e1a8dddf118d3ea71b39d135cb049eccf97199ffaf2d10a8211ab1afcebaa2e3492672f98498da7e37eb197168e402964d3917dca +DIST thunderbird-68.0-hr.xpi 583787 BLAKE2B af98f536e0cf26e2d949450efdcc79529056c38cd0eb267b2a3ab5ac5c895ca0ac97b0d78ea3853e03ac0eee51d2b0a45afe2cbe2850da17b7873608f0fa6f85 SHA512 ef327533082e6e8f35ecba996d0ae73c4d2e1f18d4dac7d323f7de2296394ad5ab26ecb2b996210c5d28319546d287addad74623ffed801ac548f8529624d04f +DIST thunderbird-68.0-hsb.xpi 616039 BLAKE2B fedeef8593a328aa262985cd3982a1c23cf2e9da2f3ab119ef5424a71ca2fba23bc76d1534b682ef92212a58fef150266d3240ee934a53e8e5a8118b4203a41a SHA512 9254218b7628cdaf97af82239a05b8287cd3e07c01958a923d67a5f3b681f52c3ae96b8c33127b289f080eaf69e651218cfe9ebaa49f9c55303784658e79a4f2 +DIST thunderbird-68.0-hu.xpi 618159 BLAKE2B d215510661fbfc91345e3a4fab6bc97b22f2cc980c8b121c7403f2ecbaef75e9036f962316f0f4d1ff5afba20faac95f7e1efb205532bb6e25bc3d558b145cab SHA512 4da44d0f54ab8832e8eb5b4484fc06fb3bce0588fd0a4a01ebcc8f42f44c2600df368c7b9a7ecd55fb0473e6f1ce91fd26b6e6cf82f62d6f34c96345b4139027 +DIST thunderbird-68.0-hy-AM.xpi 630527 BLAKE2B fd238ef369849e74a4302dfd9835d9cfc7a9086182d2f06597a34a54b25d15b433b6f29472df25c638ba7722b597115f56f08b604c1e56354d07e6f0d1a0acdc SHA512 1884f9a7ee6ca9b5fd3104b446bc1779a5021de275ca245a7796dda487622ffb35f92b3693a48bcc9983bb79a82be700878546aa5321e29e7aaa7d63cb63362e +DIST thunderbird-68.0-id.xpi 567750 BLAKE2B 829b7d86b6a7f486a0500fb76d8fe20a7de1e4e18cf2b817bdd23c6b3b26c3b518fb647c7d983be3812c59427700c1cabd1761a7c1428f8c3400dcc98d4eeb9e SHA512 e154cddeb48cbbbe090f42ae5fea785bca4086b753b6eecb958568a30c7970c761d672b164c970f2b06e6c446da34e5a70935e54c3886195b946b6c66dc1aac7 +DIST thunderbird-68.0-is.xpi 575444 BLAKE2B e1469a504c02d13c0229146c5e95dc411c7881a2dd73e3b83b32872526a8ced983e4c41f08efba7ca193027b9c4e3ef85e836303ddd889b35a87c676c654609a SHA512 e7fa884cea521f95f70840ab1e5c01ef0ae73c8c352b8201df95182864f2fb467dede7c1de5b8ee8a4b09212b1581f4e52fcc608e6463b581af0976a35c9685d +DIST thunderbird-68.0-it.xpi 489522 BLAKE2B b48cf65017df7a97576d58e69c89e22e5d4b919a167a7cb11c942511150ae96fb7727e74ae053ce8192b93173c655ebd9d11c5befe331266d0b9ff48dd0f3eb9 SHA512 2242f359661904027afad7ca3edaa0af3e7ba2737b4e7a217efae55d3d7caae629dcd913945ae417de04197e70bc121370ddc92e11fd888dc57977ae803fde2d +DIST thunderbird-68.0-ja.xpi 643578 BLAKE2B 86ea1d5494d69d5bf5c9ef33baf627c807f15b3da5fef79ade76a320e42bd163d2bf26bac8c3b58e103b4b68e5f729f281cc0a898a073e300069c26bc07b76bf SHA512 cbbf432c8f0eef14bd30d080187ed366c391ce98b963a7f413c2bcbf816a4c032c73daedd061cfde8088e6b8538a5286d74464762d56bfe709f737b4622dc277 +DIST thunderbird-68.0-ko.xpi 620532 BLAKE2B 640c4a4718e9fb75e4e57e48cc72e3ea69a59d45cb2755aeed44503bee1a6727615eeb06f46dec8aa10e98fb3a1ed27e70fc2b8b8e3bf47f342640c7b0c6ed64 SHA512 44b3714893997448cd6cb08793af861a434f1aedd9b52ff5ad4b461634fc8506958b2b4721cec906b623de91cd3fb948500f7d4633878c0331b7f98b529d4242 +DIST thunderbird-68.0-lt.xpi 603849 BLAKE2B f3ba5e2f40a4d4e1ed6819559248f65cd738fa35db56a3ca24eaa5a32721867abb28a16d61c1087f3397a8a63c01830cc1d35c0ce51d1487fb4d581241ddc7e1 SHA512 43cdc2e96c2d4897274c7e54efd64bb0ffc13f0ef7cd782937426df3f6f60d6bf45ec1f8e1f5a474b946c3a5c7e3ce055dae4d7526cc2462178d1f3f474145de +DIST thunderbird-68.0-nb-NO.xpi 574024 BLAKE2B 95b409936005b7d94a3c1c54ea6b3032e47d4ffbee731b06e1dddee9e0077e4eded55ab3b76e1cfde619a6e4aed586a7f396c85db2026c358a1240f81f332320 SHA512 9dbf9ef59a3366d6901a30ef6511e41e32cb37d507c8867128394028f06f69fbd85de5d3fd7a1a3b1a18e60a40d91d66f569fcfa33c28f3de42f4a402a148e9d +DIST thunderbird-68.0-nl.xpi 581358 BLAKE2B 35d574bbcb2348dcd864a9035d63189b0b5c6bca22b6123d04a234b7ee74a1542b80e9317aaaa83056ee435829284fd006d102ada8482bbd438721d55b29a203 SHA512 d421b341edda4a6fca9907df21a86a69d69f8c67a74fa8ccfa6eb9ed12971ffaca17ef28ce9002888d7dbccb99b29312a53277e29fab080009a0ebc0a67d4399 +DIST thunderbird-68.0-nn-NO.xpi 574952 BLAKE2B 15be15620ffbf34bf2149d1ebf9f7fa539478253a0ce06234cc011a5076efa4cd70f6739997cc131e300657bea2c91e9b4399b136da712ddebd1eb0f4cb81cbf SHA512 f2eb82d0364883d683e99c1fbc8d31ff7275d72a439859eb51b6e190c3411333f0102736ee206547d9578d4e6aa33f9ac7843c0b18ed2d4e1bb52cb5b4aa37fa +DIST thunderbird-68.0-pl.xpi 576090 BLAKE2B aad0754f3e0d7ea994f71e46160d71bd54573a0765dc5978022f6255eb3f04cf28ec1ce7eafb2450c9fcfae3c0bb1897afb85459da9febfc6770458ff8421223 SHA512 73d931350b429fa61b822ec19fd169abeefbbf66dc496e2cc694763e28c2f3264996ca07deaf6819f91cc08e3fc11377e1a67dd98df5de2fcdc2e0ef053f35b0 +DIST thunderbird-68.0-pt-BR.xpi 589839 BLAKE2B 65402956dc9b102716c1ef7ffd2fdd9ac1236aa85aca8e5765fc8c720ae34b0bdab98077dc42fe1a6560c67fec5a06d62283b89217c1e5ff3c5fac2100e94313 SHA512 7a0d71960eb5d23bb1f5979d321c463cfcf8ebce5b60fc370e922468e8d3d4e95230549b447c32e70d75d39aa1a5b4ea2d793f423e1da8dc62a9a2be54796701 +DIST thunderbird-68.0-pt-PT.xpi 588106 BLAKE2B 741c7b0bedd2219bd8c274d1a192624c107344a0e8ce77c0f7a9f20db30d58a4519502cec617119d5fedd9ba1b47a2bd692762841c1654ab0bac28c314378aad SHA512 483d732c54bf516b9b06cdfaa48c246799ffa8cdb1dfb1fe67231a83abd0d2e5f5470133528f1fd297e6d961cff98404f6db3701bf48c48d25be7517e4965f0f +DIST thunderbird-68.0-rm.xpi 578053 BLAKE2B 0864fd59d6a96a17f486a5570d69ea7e933e11225415357d02b11d01d3cfd24e9d627b312913fbb8a276d59aa504b875e1fdbfff987cf1ff8619ba74ee13484f SHA512 1bbe684e3a696103190d926dc1ec1e27453911b7267c36b87f615f1c97d6720513320f90992c48cd1293f37fd009f338da6c6832b49b0597af97d928058271c8 +DIST thunderbird-68.0-ro.xpi 594844 BLAKE2B a6ecaafcde838a1f2a6e33cfadc5f8bf2f6c873740677b9e0de75ee9c3b0b973f806407857ea27876f57149b1d7aadec31a9bb3216dfa494be52851c2ba66d1b SHA512 fa8c7e41fa9e15e2bb248fb2960221d3b5c45aae1e094593e7f7b03645d1a85d93de2d46002a2cf31a487e0d25079905372acbf22f9484bfe747a26ca90724f2 +DIST thunderbird-68.0-ru.xpi 683329 BLAKE2B 17b19ec36e586d4c515bd86a2dfa3041b5d6ddbe64c1e45d252eeecc9693bf6b70855f750960231eb2bef64e3a5f944b24f414f967634bc6c7b4024bdca293ab SHA512 ab70a04185bbcef1722bc6ac127289acce4bc6410c7732d3fe653d35d3a23b14eed9c51feed317efec47ffb5e8e560c3faa80550043beddff94be90c8be9ad9d +DIST thunderbird-68.0-si.xpi 637408 BLAKE2B 5bd47ea8a09a76cb2aaf58e1e9acde919dad7de34cc86989cfe054689e13514f027061c36d2bf27122875db4c0406e759b72a8bd9117637af1bf60cfb6c6ee1a SHA512 1eb0f6728c205faee0c5e88c3801eda8f35a03e0fd5c20b7fbfa6c29aa2f804ef1d157342c17666b086c33305dbf53b706144b26b4172d6e8c91c782037f0d47 +DIST thunderbird-68.0-sk.xpi 609756 BLAKE2B 20d73444d2ae0abb41561cafff118a5a00451b7b52848c102801f9d4a860a8959ce969bf5ff1bea1e82dd909d2b853b2406d03742580ff2d74e684c00e25b137 SHA512 53f2fd7c22ee9381b38fa75290c65c57a452335944cb13cf710c064811207af2ffdbd11177f378d0cab6a5a5ac4ee3709b427f1c42b09ba3931bd73a3d503526 +DIST thunderbird-68.0-sl.xpi 590632 BLAKE2B 1cf13e500189398ce3bbaa495c0c1c69ed23443ec3fe3f96598ff3fd54b576715ca2d2c5691ac0c279b417effa1e4a477170ade32169ca93d932223642bf4a75 SHA512 b47d6ca7e6e110447e76f90d5e0d7ed23533da369a74578bb664c8a25539e4fd8583747fd4efa8ffafcfa5a01b2ed9c66c5a152fdd1f468ab2da00f6946078b6 +DIST thunderbird-68.0-sq.xpi 598904 BLAKE2B d34cda28594747e4a6ad699c071aebb599e3bb12bed97545dfb9baf3e852ec6c207e88dbfa553ab411e6d7ff5fc7b415c2f359e55102ef67e2fd42bed3422085 SHA512 7beafb5e1da2355866d4d14e38d6d0712fc6f10215a4923a941c1d1c775e79414b0ba58b647f79a4d36cf07c825d69e108d581c0ff2471a76500714499d9f57a +DIST thunderbird-68.0-sr.xpi 624900 BLAKE2B 86950081a0b20b1db3df4c140fcdf1e9fcc3cbf8cf1287942a889dc6e18ccdb71e60e738f1e8968c265484166aea1fc6dec1398ad6377ae53c7d7753c812381f SHA512 f6b925a53e37ab50431a0062dd53171a1e59c5927c82706eea337d9eb7f3b03090bc383b1b8da5dddbbc67e3677962c0b1d79196ad839af7e7aa56cec73ea44f +DIST thunderbird-68.0-sv-SE.xpi 591599 BLAKE2B c9ad5ffb39cca198da8b9ad3c9599c0be400d0eae6901c4acb82b9c71472ca78e4765fed1f85d2c1ea74fdcdd24670dce8340c392f1c71463e076566ee0c686c SHA512 24834d4e6a8badc3a4edf5d93e5a83249b96fff3cc9b918eae06c99457ae9ee399a2ac479ef3ab0cabb4d06dca44e56576913162dce643f725ecb051b5b6f283 +DIST thunderbird-68.0-tr.xpi 599711 BLAKE2B bb852ad1127ba445fd5f64f6b2cc90723cfc10a396915a73fc2c297872720abd9a166a6a24993fc08b5eb0d4ccfc8905e374886a13040e151e65e7921c584373 SHA512 83bcec20d0a137f5a7f480bfe3b05d32549fa7a4e07b449d96023a7b6b0b8a7e87ee0202de2a6e6b77e825ce048b021f27a243f7a8f6bce09fb0a8bd6dcc8306 +DIST thunderbird-68.0-uk.xpi 671458 BLAKE2B bd66d58c1a0770e4d4453d8b5d305943aa5012d365b4520670ee61cad1b569945bde7540a5747f66d6ad9cd56f8499e1111d90d2666d91b9149e7f34653f6f9d SHA512 55330dbd8bce9cdef80a081ab7219991e30da74a4e68eb7447c9a01f6a07db9f7fb12d2a7a826767cb70c112274c36119c9fe77f7896af9e2e28211bfc75f0e5 +DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8bcdc8f0f8c9a809211824fb0340be7ed7587eeb0c7bff27ced9b06f7f084a46d0d25354f0d5ea905bd7562625d701 SHA512 4fa2b202881d45680da6fed5e3c9332b64c6aa539e6f19f4568f06ec0819e7157392270a4009db2e45ba9815ce696a87179b2709839d68236405e88542892857 +DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d +DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f +DIST thunderbird-68.0.source.tar.xz 338451344 BLAKE2B 02e262b860076fe84adcfde2e208868576a48e63ceef4327e9a5196532e50c2a2b5069868d3b91d683373899257f377daf7a86d33eee1a0d4b8174e6eece2fea SHA512 91f82016b71d65b58c1383248ac6f7a8cd8217409323eb14e8aabf2e509391bba4d18e0aa6d0cdac191d10e9794977f22f509078b7c5e3ac7c22afe379a0f299 +DIST thunderbird-68.1.0-ar.xpi 617169 BLAKE2B f2c052345364bcf33f47c8924d2442c891ecc2fe0a17b3675f97dee18e38d18d139768010a80a69de7d45ccf31c328a50146d8dc2ae67051eadbe34d889db68f SHA512 ddeb1671822f4081e644dbef3e6ebb3ea1d48a0390eed1fcc7ad99ffba4cf00b916c661e74e87e07faf614c9e7226a385825f2eb9ab676058d20b6c560ee42b7 +DIST thunderbird-68.1.0-ast.xpi 551302 BLAKE2B 25a2cbd819dd587e27a3b9460f52f9b6b730b0d6f7f10688729ceb1aaa69d1f2e3a5fc93ac3387061ee2de4734f27246d958cd0c1ae235b38e53d8a772123e42 SHA512 c43d209b55af877bef377f109a387fd409fb2a04e0eb39f3453679d159aaa04ab4e68b97e4dc9eea55da8ecbd7adbfc6f7551c94c2421d9273903029b77d83d5 +DIST thunderbird-68.1.0-be.xpi 646281 BLAKE2B 1b977ba362d5636b7ba102510c9e0fd881f5c822fcb8ac71f348af0e4576d7cfeb23dd41e39bcc3cdd806e8c95008c3175a440a39b06d532f9cddd77ebebfa06 SHA512 e01e19e92b43380076467c26bd2c015c91402c8dd8f823ba05b5184d91c4f91d3d228918c812e06f08e174c798f0df0cc6f683bc4a43460ad52eb5a82417a810 +DIST thunderbird-68.1.0-bg.xpi 646229 BLAKE2B 68112d2c182b9c05db30a1c103dc172e2a1e99ffe19dce1600f78ab29ac64940731b8c4eaa2d1bc7cf343d1d7b9a76e8cbcee05667d2177f6df8ce262d949d3f SHA512 af3f4075c95ad4dd26ff973e411d58df18b81a1a9443db2816517149c95641108921ab495577c1a459039f4062ac62b21ab8176e23bda415b5fcd895e42d5ec9 +DIST thunderbird-68.1.0-br.xpi 574853 BLAKE2B b6f1d8f102d7fb4c4f2a2733f4549dfa9148ab745790b018f24ae0bb8287f3ea3742e04571c6c800d3b4ab8f3298687816c5ec62571878915b0162fab095edac SHA512 b4a11a85f641ce6c19819287e71d1bc4da841e579e8662041d5f634156022a1e845c9f07530a1f56a2e3d957e446b98f5009f248d0cefee2a13cc70057d57906 +DIST thunderbird-68.1.0-ca.xpi 578441 BLAKE2B 846ce092dbf1c8dcc6eaeb2ac158971aa1bed34492dc1f567f8b1c7542baa1b7e028903ce81de11719e945433b346d8446de34b0f618760c1e6a494e6ce3ad0b SHA512 4069e41ef89bd77e175a7860ea5af914cc4931122b0f3357a31c0dd6a62f5d3fbe976fae6c89cebd94c481c0113e18e644eee74081833008bc017cb66785bb95 +DIST thunderbird-68.1.0-cs.xpi 603045 BLAKE2B 7b51ed3f0b84c9a3536c6bcece686885b28393734ad20ad389ba5649501db9ee219ae872c284b9737cf7509f1561dc0ab15f60bab2dcea4189c93759aa6c1842 SHA512 a68b0227d748dd67b7e0e85de489c9973914a6ac3d859ae766f67761b6c80827ed7ae57fdb2cc222c5da25ef901cd9b17e1cba8723ea7143b76b49e9397d3501 +DIST thunderbird-68.1.0-cy.xpi 589905 BLAKE2B b9eba3068f38a64e66ba175cb1ea61e2fa85c9ce9f82cca643745ccf974c4abf21f0aeb041714ea3d13dad2df70629557429ba6efd60add804dab03a6d60b8f1 SHA512 6bb69e2dcec1aadc635cbc2b1e904e7a75bb7e0348f6cccf185e3df605cafe44d04c0577535dd79896c3ade3524ba7946cd9c204d992a118a5bdc8097c88a0d7 +DIST thunderbird-68.1.0-da.xpi 588352 BLAKE2B f398b905834486c26358b615076d6b8a1818a966f9ddae60542dee97c1c0204284614adeebf337d65886ddc1796113e51ce279ebc11b38bfd7baf75cc845be39 SHA512 75768a064d16e8e9cb5c43d59c4b8df5870d94c92cbbff6161d065111872489c14c010b03427c3f99556365a7c284fd8b804904468fca1862225b21f88f7ae60 +DIST thunderbird-68.1.0-de.xpi 597806 BLAKE2B 3ef6c05315259ee073324bd703827dbd58c310b2ae74fa8584d33fa61fab76194f339d90a7c795b83a276801b6463c5bf6d83a0a84b9743a93ed65d102d44f1e SHA512 9bd399c527228008886b2916a58e1c5cef35faa86309737ea079a0225ce6b6f431adf7ca3f3de1f77daa0013e5ffe97b3c93c1038c6696cd8f079404e8459083 +DIST thunderbird-68.1.0-el.xpi 699223 BLAKE2B a7a5eda069bf7b14dd58dce9864e31722f45f2dc1ac076d699a369335491e83058024e6cb94c116a9f8551cc96176ca7820b2ac732505b0621888d659f4faeca SHA512 54199d2ea585ae213722035e26b6afe67eeaa2676a8204cdc7a68b2e9b6d6dc3b678af0cb387e2992cb9d264c51e9cd938052764feedac0bc40d509197648f15 +DIST thunderbird-68.1.0-en-GB.xpi 556405 BLAKE2B 7eeb4b66407fac8b713aac3e6890c5e6d20bab7f8dd2ee103880b9362eda8ff82899a9c9fbd85f2fee7a38f2738f1933f22a0353157ca8abb90dc35db15ba2d0 SHA512 d918ccdce2631affc69c554c5a18b5d6c558f874bc85a23cf87bfff111b1176327d059a18a5a74f579b9b8e5ceeecc8b6545bf6c9653bbcf01f0f928cbb51956 +DIST thunderbird-68.1.0-es-AR.xpi 596554 BLAKE2B a451b27ac4a8eb177d016c376d683fcfe902b7a19a8cebe1be2e735777f907504b338e2d5cde42ee80aed63fd90fc7d5c2fe2f6c49c8652504f0d71c28ac00f8 SHA512 c7eaffdacd5fef01854afab2135df48a417c7ec0047aa639ab11a64a39f872556ae0ef39fdd07b4f969382436db258c471995fd7289673bcb6223c1a22135820 +DIST thunderbird-68.1.0-es-ES.xpi 518353 BLAKE2B 4cecac1c3abd80e31165bf8426ddd1709b868428f7a594475dc65683aed770a4d5539356794865956fd338ddcbb79c066af60ca286e15c69e30143bcc423e5fe SHA512 cba91ad6acfc7e42393a106313b42b2fc597594e68b82ec26bceabb4af2b9f9ad6953e87a74cee2181d013d4b2b7c699d1d1386052f6a8d90bca4f7ae30cda07 +DIST thunderbird-68.1.0-et.xpi 573582 BLAKE2B 0f41bf4c7206e8e01ec8b4e9109231a62aec05bfd8d3511d2228570b038fc0111d319eec754bf19fcdc0a2a3d2bab9848036a8a0abd75dd9e8c10377c3f1e4f1 SHA512 32bc624c0cc526f7be4e898a5b83ad7049e9ef7c1957f7077e770f9f967ea61fede3af30a1b4cf4cd1502889443e570cee97b3cdd026077b08b3ad04893a235c +DIST thunderbird-68.1.0-eu.xpi 579945 BLAKE2B 42ad1265a054d839ea403dd5273d21b20255a31d983a35b882c30bffcc0aac62b86a34f193c4d0692bca7cac55e6050713f9f285fb6772605bf49d9d1116773e SHA512 15cc36103fcf58a49f12664798211182aed97ea35dc4874694e6900138bc3ed2e2b423f5876a8a455a58e8677dcd5fd67f07432a0fd62ae39992b5f069f90d5c +DIST thunderbird-68.1.0-fi.xpi 578420 BLAKE2B 266de74e7a85d7a71d0ac74305ef6de1b930628de32610644718defdc1db25a7acb5fce716bbe11737c8adb9728ac3fcf5982c537c1bb3f8715924039785eaac SHA512 c6fadd61e6feceffae6180530318b35b3e5319dddc12074cfe727bc8fd9745ed03a92e7555e6daa99588bc9aa9bd731939af7151cec5c6083b736aa2f37275f6 +DIST thunderbird-68.1.0-fr.xpi 607812 BLAKE2B 131d735f828cc051861c604af50ffadf273e9744e3124bdde4036c1c4d2d9f6d68839f3a1bfcab8a910d557c522a8829cde070fb857fdab22bff0372d113f564 SHA512 2a86aa969828c30430d89dec23bb04e842bde87eb35d2ee6759eda07148efaa6a29e84ace654ab224dab34d5fa061a61172f41824643479934e10ad73cb9f209 +DIST thunderbird-68.1.0-fy-NL.xpi 594470 BLAKE2B fe9094febccd3f84182666e52be9718d012e4035308dc2b085abaa9558f85568b33c30b8f9049abe08016a151243c0a46fe71822dd1acdfa80eb6d6d442644f1 SHA512 6732b5bb3c18cae9c0021bc38d7a4b71c1ac8c266e0b06d7d83309a07d45f8e3da64672118e58e4c160d6a0b91916e0e52e505bec65327914c5342dab1bbc2d8 +DIST thunderbird-68.1.0-ga-IE.xpi 588711 BLAKE2B e132885a47c8d4877c7baad0dbd85b65a87746ee124877b71ceea8ee8de8c93c732b0165954b8ac18e5767f17507ef02614eded9200c81a0c079dd48bb363763 SHA512 cce49ce68eb7145e360fde34f88bd411ed9ffc70bfd7d0aad5f78bfa46d79ca3e1a52c6b036f4affebd1477818199ac6ef2f515640ca2e646c45f1fe1896930b +DIST thunderbird-68.1.0-gd.xpi 587112 BLAKE2B 868bac6b84d91729d0291cb22abbca5306c94b96e49fc0dad738e7f30ffcdeffa9939c520aba9cf38c4ed6bb080458db6104fcfd1d63d5ff3f9342e51461dbcb SHA512 501c39c75fae95eb688d85f28c2b5993afa9d645354e402d82041f578f92039134cad6ee74a21fc48562b7271bfb58e87d565108c3c65fda1611772a5f1f0270 +DIST thunderbird-68.1.0-gl.xpi 568399 BLAKE2B 6d8812bf4e7e1cb97578690ff1d9e54326a572360c9298fdde71ff82b9d18d9a2559da0dab449527d69c960ebf33ff5c65b3bd01b23528f52b9a537728ee6ae3 SHA512 25bb290e5e25d85333c114b95c5f62e3c2cd8f1a9c1bbb180f234be1933754a8e4511166e314486c3899df1269ae3e58f737312dfcb484dced8e8561b8f15768 +DIST thunderbird-68.1.0-he.xpi 604790 BLAKE2B 8894a405cf308d58e24d033ec375e96a200040145380c6b999394c1d1a67bab89281c947e5bcc218e1de6d9b7133c92f2062e180c1766629189aa8ebaa7f2a2a SHA512 5fa36355c907cd1eefdc473ba68294fe5cf8214dab6d3f0c603333e7a15ebd17be61f5206c871546c8cce7e74acabc6ed415b0f319f03bc8ff1355399280deaa +DIST thunderbird-68.1.0-hr.xpi 583784 BLAKE2B f425f09a95b3cfaac01a66ed514803cb892cfe692d38c94878eed63dc2791c3248528077f459c53211b289be69db9bf85adb916ab986fb964f2d4eb6eb1a6a51 SHA512 277eb466c6a22f9e2639802481bebb5088eed77f50725983125bd2d470aaccd36ee52247c8f261ab14282b171938e994bac459fede6fc7f0af4cfa7ed25988f9 +DIST thunderbird-68.1.0-hsb.xpi 616037 BLAKE2B 5fc6f21fcca7fad7c491ce2d7f8bd97a08e3791e062c3c6020df80cdfc9b549f60f76b7ff03eb6f6caf1c119da10285a880781127e8ff73fbc69e3a6a016dc6d SHA512 0e978f5cc7f5f5f8737d8e4ed2b917dd77e69f337a12feb0d8a8b24c8eb5baaa55e1d0225473a4ffd802c701e6bd5674160e7b5ef7801f35cb0d78e39c9a5dd5 +DIST thunderbird-68.1.0-hu.xpi 618155 BLAKE2B 1a4d1cf8ec29eb4eac0f24470eae945dc6e3bdd0bff4f84bd2de8eca522e752ba157fc85cdaab1ed9a8a18cd64908bcca93cc74571d61ef1e5e7a2986ec3e6bb SHA512 adadfca956bd3e29c260e70498318e748d5309f84a63d2cf392b124b362bd5e1188a2dcfb8302c2e44a47abf2240067db40d1a05fb7c3c8f4ea8649647169461 +DIST thunderbird-68.1.0-hy-AM.xpi 630527 BLAKE2B 25b8d2c0acb8dd099a111143735c0e25f8c9e68f53b258ef2212dd2bb336caf5328578f61fd00b84c100fb847ca5892975340b5fa840487dde16dee08de6525f SHA512 32ba837e14145b8348d132bac7178ab30f4979600157c57f621e18f85d727cf34dc4fedd5f363b6085371c657a45d39c5a73eae88ac55f46bd68ea84ff89bdba +DIST thunderbird-68.1.0-id.xpi 567749 BLAKE2B 1fd32cfc990c3886ba5deebce62495655bd501349134b94db48c47825c8b0c7056e082674bff3dfb541d3e0c3cab7a2181fee850f410dc38c8fcd0748bacdde3 SHA512 f0790b6dc0753b6bf6774568e9ae688f2f664b85776e2e98c2c7982d6f029142330f85a6070480b216fac4d5b114dadeb8b03e7afa6f71a37a0ce894861c6dbe +DIST thunderbird-68.1.0-is.xpi 575442 BLAKE2B 6d5ba555b30913c15da817a7803b82de19cd43d6d5a853e077eb1922927c6ce6a9f3067f48cbae5592e45dd071dacabb0ae50577f789b31dc5bc76680e61e33a SHA512 dba89e9f575603ce819e7a35c31a890499d289a34e4d26ee336fc10e12390295f00950b796ad9fad273788757168e67c74fef21e034f3ff350095b7f6788bd2b +DIST thunderbird-68.1.0-it.xpi 489522 BLAKE2B dc98233f8cffa4c60bd384fd67f52a77795fe8628d29f12db04744b421a802f2d158e59e0ae4fe0a45d1fe0b69bdb0ba5f9561b0a498f91ee397e592918f0bdd SHA512 42a30ee490fac970f64b36ff49678bffff1c6936217c791eb63aa0a5c65995090e08c91799e8991cd6293cb65b53649bb2e7d380934d22855d9d7a3af286e8d1 +DIST thunderbird-68.1.0-ja.xpi 643575 BLAKE2B 38098e5be3826ac22aa5bcbbcbbdab85b46afbba9207f26d6f37d769fb6b0e642026de3f7cd7dae14475553456d8b615429a92f6f9bede07a268687db6288ab6 SHA512 aa907bfec130efcc49eabf0d5e2a44614a297be644f4c7c70a5eb0af3371381996549d86c752b866c42136bfa5ef53bf82fe0c0d673f5748d2bfc24567544752 +DIST thunderbird-68.1.0-ko.xpi 620532 BLAKE2B fb381e0cd1c995af77fa787c2092dad87863aa97ff23d1f36b9d91db55e92a58eb65a9663451ab6af89c8b69188671bb1276612b8feeff66f9deba1d0f580cb0 SHA512 d38316178643cc32e98bd0e0349db22950742c7cbe1958b26d885e67da21b9826d4d5b3f54007985d8aadc4efad7c1cfa86dd0dff230036b9535664fc0f38905 +DIST thunderbird-68.1.0-lt.xpi 603848 BLAKE2B 502083b480c4239952a42c0b7300c9e688c163394a4cfea4ba9cbc6a009759cfdf09193e6cd1f205f24e06b2e8eee23e6a7948d4748e9d26db23dfae1d025e41 SHA512 6cc4a83f09a406f797d012c53fac311cb4e8fa1a9d01e9f9439f229a2ec1b02ea87c48d75b9d2092335090f98379a3bdafc383f8b3608393d33479b077773ef2 +DIST thunderbird-68.1.0-nb-NO.xpi 574023 BLAKE2B 2b9521973dc54f121da43ae1de8e27ad3ebb89d1fcabe4b1a29e9a370a6c5cee30f44c5baac9d189b4a3c0b92a097871aeb413a490519210d32e5d4d34f2c9d3 SHA512 cf40bc431860dc18969c68305467ef46682cc968e5ad7f3d41cdeeefbb1b588fdf81c06a971e696ca76f87051da3c0199d80637801af971d350ed71d3333d0cb +DIST thunderbird-68.1.0-nl.xpi 581355 BLAKE2B dc32f6dfaac88a741558c0c5c335bfe68fc81793415d59dfd2e69760829f916a603667d7db6ade7a2da4df1877e9b135dbc1d2da129a24cc604d70b7ca45495d SHA512 9d0b86fcb86d0a6626f07ed2c75ad84aba6829637ef3a590e549914acb1d615581fa46d46dc0ca6afd7079dcaadf17712e9f5a1904b0bd54c3eb7ef486bda4d6 +DIST thunderbird-68.1.0-nn-NO.xpi 574948 BLAKE2B 7fe72d1ee1d7eb90dc85b8ed0929e28c8645fd5c8673ccca41de0db9aba3989a6568b111d556517075ac8ef31cd173a214b9cbbf8a65ae786e7ac6d06201ce15 SHA512 0ce857987c1b3de4e5d58c12aa5c4740f706217bd0086b7e8e97a342b1ba41ebec57564c7d7d64cd9fd7985cfb0083bcacaf151ec5f8f679d668ae63212600e8 +DIST thunderbird-68.1.0-pl.xpi 576087 BLAKE2B 7000e10cd0c5be8017fea6a6419c7216a76a407de6dea9d0d2b342f6e2c8ee7f569a1b89417dd7f3ce31790d802b95f04aabc22875d20b805662dc77cd1a6d81 SHA512 b5d871f7e41c7fb9786abe92fae62a07a8f7535e349a231892c9f96f2cef93981a01dfe0afcb64f6a9a0486d4946ddb6817f58793be8394aacd600da1546339a +DIST thunderbird-68.1.0-pt-BR.xpi 589838 BLAKE2B e9f0cfb6ceaf8bff5fa3a41b68a5a4bb8f6c1d5531af6870d28a9e9ed5e2ec3ab9b197a7366e044eae7c2c386a1a788fca9389fae421032cae5521cabe5ffd9a SHA512 23c54db7c1ecf776339d890b19e60c5ccc34ac3e7b951b783f32b2596eee3e1d94cfaf8b0524a68c123503cda147abddf2e5370026c261c87660568a1e0dc518 +DIST thunderbird-68.1.0-pt-PT.xpi 588105 BLAKE2B a997dc08cff42faa5607c9acd8cf4ba3c3caf3be137839f68a40c0eb2719bc97cb34fd64b661bb4cd00f9ea172d1f07d08e7582efe08e49d3553274a1c113939 SHA512 c0df20c77b1a811157a416f2e394a7c11ac7543d2eb423bc7b5e0cd51753258a8d12b58eac84fdeeac3867faa9ab9b0a490d33cf84277691ea4f1acaf7f4e89c +DIST thunderbird-68.1.0-rm.xpi 578052 BLAKE2B 42347c322cbd54a4eb7fdc0554c0cfa9f97f836b1265d82d733cd3251aa3fdaaa9632630fe459be03e9b8c21e12cc9a4ebd77fd3c17d9ad148f8e7360862bd09 SHA512 0bcbb9b306f88abfba65c475bdc96be526963ecac686c7f0547da81a4c080746b94ad08b24af678982b1a202203be7e78bb069ac684bdaffd4c011b31d8add41 +DIST thunderbird-68.1.0-ro.xpi 594843 BLAKE2B 3c94b1984e647dc52b462411e4c072a0b1150900be582d3a2609edd63833550257b2c35f2a4ee6877a73eca52016841e13dd4d52a789a59102672958045a9be8 SHA512 027831d7b2ee8f333072b240007c90bfbf1ed2587f76ef4835732d245bdaf2eb440e289a5f421e2cb36b5ed7838d89a5c65424411d5e9d9e41d390099a79c9dc +DIST thunderbird-68.1.0-ru.xpi 683326 BLAKE2B cf4892f2c3b7fb2e42c6a15c6b542c6232c435c8630c4eac4caf7284f0b19fc74b5f323ee49af73e34463da2ac620a860a047151afdb5ac1d33a3fc4a01c60ad SHA512 3464b6043bc6c4b615ec97c0182d5db1b18d2dd2cdebba189f3afd6ae819180de0601dd0d12236e2c41707accfbabacd70cfb9b27dbc26c59ae0541254578d10 +DIST thunderbird-68.1.0-si.xpi 637407 BLAKE2B 1fe283e54c90ad1dc981b9eed3de04950d5b170777fa5eb4f0449d1bd436da18600457551e9729621d74161f26a611dba98df7a62f44d169df59723e7a57f2e1 SHA512 5f4ed5f27d8561d0e9301115ad93970608486b688fd4c35fb02a1a4d8c3eadeddb66db4ead3afa61e94920885b1bde3793e97d503b718a9eac7829e920bff055 +DIST thunderbird-68.1.0-sk.xpi 609755 BLAKE2B f017a9d54396befb3fc40470cf82eee753dff009823ef3292ab2be1b14f95a33963fd58027a247a8ccf796c281241e2c0052ae5ede42f6cef380512777c059df SHA512 ff87a93690e0bdeab82d99bfedebbe940498a4e1ac4e473de42b5cd1a381d4966eaf937060e64bb968ad4fb05753fd29a12986f03ceb61b7ea1837e8b111ab48 +DIST thunderbird-68.1.0-sl.xpi 590631 BLAKE2B 14fa8a630abc0fba63173dc70fc97300e09b314debac5b340e627ac45cfcb11eef650876ae9f3f0922b0160d344cc3d2833fce8e732bd5809e95af74bca324f2 SHA512 4a346553f14dfc0aef74e73ca8ff247eaef2eac444bc6e7705485806aa6c098432918e8a13461d0d2eaaa44add51d88c77e4fbfca699bf2dc417a5283c250ace +DIST thunderbird-68.1.0-sq.xpi 598902 BLAKE2B 09247b404a189fcfbe88afea6ff35a3f47bea9f1d318b6a5a829ab5fd48c05565c0efa60100ca1c1feb9b5e5f100d058f0c52c796cd2fa22366f7c729351fe92 SHA512 08a4e32481b608d191075f1dd02e67d505300facd2d652e57da70bd79b11ac7e448c7b84f183b1b05e549be9e56e974d6d58f7827456306d0079414fab7f042a +DIST thunderbird-68.1.0-sr.xpi 624898 BLAKE2B 6a1c707d19251f53d32b1655bc429fff9404dddffb385a07f5c0e6432b5de0aa11780618433dfd09af435738bfd5145778c90c2d34f30259a3ba22b578a44785 SHA512 147eabefe4ee72653e49b5a2390f3283f1b527d0f4f89f967771457807f9fa9500c0b953fe0473df85facf9c925826df6ffe46703c37b7726a30ca96a863e550 +DIST thunderbird-68.1.0-sv-SE.xpi 591599 BLAKE2B 15f4cdd4e0e620c8f9d19e9e537e0498b8a65a3fc06ca8a675ecec75cccb345211f00b228fdc42ee536cb4a4e9d0ff10bdc343741014ae70a93e1ca0e2363efe SHA512 346efb8e4df9ca17241000bcebf1ce70e4efedb37d59c081725402ea86ef405543d3d237a434987606b927fa24e93d5330e7c427f6db1fd27c3ed000d08cdda6 +DIST thunderbird-68.1.0-tr.xpi 599709 BLAKE2B 1e3636ec0900cb65c23bdc56c40bce2c3ec8548d8dce4e2039ace53140fb8f4b35c7b5487729ece0d1bf0a2e39e95e9d77d2a8c9314f9ffafb36fb5a115b2dd1 SHA512 9d53788495096fe5567caee9110e7c7df9333cf7330705768895730adf18f83ba53c10dd621cd5e99330d79c58cb05b64917858f65685805a91b1cc33377e0fe +DIST thunderbird-68.1.0-uk.xpi 671454 BLAKE2B cb0d130d35bf3f9d249c04dac2c84f056bd32ae1d50f7287b6a9a5642414d92f7bcb88ca31d33c3f48f409c7d336da10a040247bbdd1de25143bd35aaa4006cd SHA512 e80cf803c794114110dd6477d5d57cad5166a20ece54c86465d105e69b733b9b086fbe66c506dd2484040d74b5d92fb921a8bda3d88599b9ceff3f77c20300a8 +DIST thunderbird-68.1.0-vi.xpi 623424 BLAKE2B 727c003698a48314b735c7aeab8097966bf4d5f876aed7716b908eb7d78d6230bcaab5e9515c609232d92ae50c23fac413c82de946ea608d243231d6ac82e281 SHA512 0a71b075d23e5751e38aebd4a855c1842b515c2ce9ad52ff39f668ad97f709f2a59cb8c32d5e00f54627473afad6a882ecd4eb3164c754c3811b1cc4f579b4e0 +DIST thunderbird-68.1.0-zh-CN.xpi 626821 BLAKE2B 18e4d225bdd0b765d7f9c1a5351c9978ef515d26682c1d209f9c2e272363dc3d5f0d49df88c97f869ad2042d2b51f940e65bb8f7897cbccc29b38e8ecfc53cec SHA512 64b6098dea658bb422037014a9f1ecba5673f7297e98fc86e1c2e5dd8a85bad21d1a6c609b69db88886d048453460d910363d3c3000aa22432924b45466d1d46 +DIST thunderbird-68.1.0-zh-TW.xpi 627477 BLAKE2B ff3b76ddbdffefcb7c75c185812eef137e66ed370f819d94372696004e702d9f18aa370df5a51217fe24bb7eb705614606052dae30a58d10ca9d2a6ee5ceaeff SHA512 5d4fe1509272f1c0a4d857d6cb44eb6d6fa4d3c8f2e573d0200f39ce1de937f53438a2defe194b397104c49adb92991a20324cb0a79baa7e4f74a791cbffd955 +DIST thunderbird-68.1.0.source.tar.xz 333332920 BLAKE2B b4bd65b6751b377a0d42c3069e3d8b02d293b6e049e3c16f7e750636fcf6afb81e593dc80ede4646f28b5f77d534d1a285168fe69a88abb7268ddbcaa469f4bf SHA512 eb2a71bbf4b87ee1156f32b3829cf6970855187f9e60f5003bd3f3680b53b80f34220ed2575c26834bc2960b2c85b2b53c2ee5437b4c19031f94eae5ca9a010c +EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90 +EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b9e2db9bec34997f206b90a8f6a572e5902665daebc3ab9b7649f55e6a4d2a355e5408ae9c07463989bc332666b7c466 SHA512 0aea16f24405ba73b053a30838058f69863d51f9ea7a152151b90c5cf8155ae53fbaac5deaabcdc9177e71253df997d81ce9fff809713f8f0eefd1144cda5c2e +EBUILD thunderbird-60.9.0.ebuild 18269 BLAKE2B dcd7601e846e04d22be61c634cf49e894239b7f7d9aded8151208b0000e1ddb79e034a5d2704f7a51630f34927b21acfe1e607fe52b834afdba2cd681655e496 SHA512 979ccdbfde25c34fe7899e21b6b9471e36e67a1afcf44e2a26cfc50be5c4bb749f4c240dc5a8eac7d250af738f83e7f31e7e53927cb17655c2f500a3f2b68b4c +EBUILD thunderbird-68.0-r2.ebuild 24610 BLAKE2B 25e89232f280eee07e53d267d7a4a366c848c0c4ff9cb6dd32d36de98e85a04f147fcdbb103c3fae20024df469e03e2bcc99c28f3dfb5ce322d8a8cf7330dddd SHA512 eb03c124da0aee6afc2a47b1d1e7d1a257ec527395530e0502a3527610fbdeff49c27d1cd8a47f6d09fb91cda5a7521dcf2b2871c77f9879bf8db5e59b474b26 +EBUILD thunderbird-68.1.0.ebuild 24621 BLAKE2B 0c8e14cb0808ddd0ff32e7a925f24aa49ad2f5fe532878e298068198999483a934e099414ac7159cc423a77dca5f87a9e2dc0587490f47bab0d0121f9517adac SHA512 05131c4d9735dc03253b43b59a9735e7990cca72ba707f97534dd3e302c42c367c8d952f013a294b4967b52cf5aae99f765ee8497a3e2c8bf099719504051eca +======= DIST thunderbird-68.1.1-ar.xpi 617172 BLAKE2B 6f993edac7b6002602c28d42419ea94a7ffa8d8eca8b808dd904106c65cf1f3e20f9f5e69a605997be9b53dbbf8374f4120577ad7651c98332d40654cc1dd6b2 SHA512 fd40a8273777368ba6aec4f0bf6363cd223284fda5e56bd6611639bbfff1484313bde514c1f57c510b7d9cbbbca1995b7e802d2fdb769ce31d72be864efd60c9 DIST thunderbird-68.1.1-ast.xpi 551304 BLAKE2B 6c581a2b3b225924ea3c9dbf9dc1469510ad760ae98a11598f498b8c158f2db91787fef76081fa8ae302894bbafa335f934fcf4bd8b95a6b527c52698831c689 SHA512 5cc2b589d7b4f5c5e00e09323417271cf08d505e12fc3b76cb9686d433bb0e7f2c4615e5f0f9d99edccd156ac63eab210037bce306cc1adf91b624b1a0eb0c3f DIST thunderbird-68.1.1-be.xpi 646286 BLAKE2B e1c3650d6033b9d684c728cfdad6834a6bd6c65b9d54bb5d36dd953ed12633e9cc610567eb25551a21822e5138d4e9add70d39011b8c7b396ad534767ab46996 SHA512 473615b00eba96ad530625d945d1eb997fe6c63264d5d6cfa0c54a359aef3ea3d41ece726388cae52514006156419aecc986803fe62d0e90bbd0185f1b90e617 @@ -237,4 +352,5 @@ EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a41608 EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b9e2db9bec34997f206b90a8f6a572e5902665daebc3ab9b7649f55e6a4d2a355e5408ae9c07463989bc332666b7c466 SHA512 0aea16f24405ba73b053a30838058f69863d51f9ea7a152151b90c5cf8155ae53fbaac5deaabcdc9177e71253df997d81ce9fff809713f8f0eefd1144cda5c2e EBUILD thunderbird-60.9.0.ebuild 18269 BLAKE2B dcd7601e846e04d22be61c634cf49e894239b7f7d9aded8151208b0000e1ddb79e034a5d2704f7a51630f34927b21acfe1e607fe52b834afdba2cd681655e496 SHA512 979ccdbfde25c34fe7899e21b6b9471e36e67a1afcf44e2a26cfc50be5c4bb749f4c240dc5a8eac7d250af738f83e7f31e7e53927cb17655c2f500a3f2b68b4c EBUILD thunderbird-68.1.1.ebuild 24621 BLAKE2B 0c8e14cb0808ddd0ff32e7a925f24aa49ad2f5fe532878e298068198999483a934e099414ac7159cc423a77dca5f87a9e2dc0587490f47bab0d0121f9517adac SHA512 05131c4d9735dc03253b43b59a9735e7990cca72ba707f97534dd3e302c42c367c8d952f013a294b4967b52cf5aae99f765ee8497a3e2c8bf099719504051eca +>>>>>>> next MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63 diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex a2ab3a2c88e5..4c035a544afa 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex db0d69e3d889..e3d7080d5d72 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest index 58edaad9be46..23792288e8b8 100644 --- a/media-gfx/rawtherapee/Manifest +++ b/media-gfx/rawtherapee/Manifest @@ -1,5 +1,8 @@ DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f +<<<<<<< HEAD +======= DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f99315604bd8e704e1f231c17d01896cd732da2449f84a59ed221fbf6a929a5db8e728977431fdcc07f3d30120b633a SHA512 8101ec66d9be4cab0c0b91336a3f83a32a6220a2f342f1c74d604c15686ee08bc7dbc090232916f13d5436957d800b64b284a8a9d3352f2f721266b07e005162 +>>>>>>> next EBUILD rawtherapee-5.6.ebuild 1621 BLAKE2B 9f963fabf47cc479f8b840648b227058c232cfaeefc8904fe2ae2ee38e4b219b427633b8575ffd27172bc49c0fc4c99973e55e193883bc1f6fb35f0176d19e2e SHA512 557b60056ab12fb8b9dea4702e7fae0d2438abc89a5f414d75cdd353ee7a99ea6cbafc4df118ad7272c880dfc0f1a107a4ffff190e9a317b75de68471c15a336 EBUILD rawtherapee-5.7.ebuild 1623 BLAKE2B bf3e2d94b876c48aeedcbb2030d282753a78da2a4c905b5565446ede991e854277fb2ccd99f409d52ccdb5df986f50525cccaf42e0b1124f68a22c0ca7311865 SHA512 4aeee80c36f123d97d55ff343dc326428f597f74d282f1186cbb9255d0ef2f29dab7ad56cb886e7b20dcbe1353a1988ff205b7d2cc3fc2c1580bbf18b8c6d8c4 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9 diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 145fbcd8ea48..1feb319ce00d 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index bf4434decf83..a08b7a0bbb23 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,4 +1,11 @@ +<<<<<<< HEAD +AUX libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch 6596 BLAKE2B 0528a825fbbfe8c7530e841c1542a9a4d3e08159abc379f09df3789ccbde583243c1ed478ab14638ffef7b7949090a24b2a9204cb5b4641f8b9bef4e1540bd3d SHA512 5c3ea6d4f0c683945ff2178fe43cc2ac3876bba5f66dc9291a8129213ba3235a732fe86b53bfeeb5df08134ed782967027b7387c12e9bc1a1be795e0c1400a55 +DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7 DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c +EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c +======= +DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c +>>>>>>> next EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455 EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c diff --git a/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch new file mode 100644 index 000000000000..02996f4f3d34 --- /dev/null +++ b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch @@ -0,0 +1,219 @@ +From 0dfaea2bcb7cdcc785f95e244223bd004a2d7fba Mon Sep 17 00:00:00 2001 +From: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Tue, 3 Sep 2019 08:13:34 -0600 +Subject: [PATCH] Add pkg-config files for EGL, GL, GLES, and GLX. + +This preserves the names from Mesa's gl, glesv1_cm, glesv2, and egl pkgconfig +data, and for compatibility with that, gl.pc gives you libGL. + +Also added glx.pc and opengl.pc for libglvnd's libGLX and libOpenGL libraries. +If newer applications want to explicitly depend on libGLX and the appropriate +rendering API they can ask for the new pkgconfig names. + +Note that the version numbers in each file are the API versions that each +library exposes, not the libglvnd package version. +--- + configure.ac | 6 ++++++ + src/EGL/Makefile.am | 3 +++ + src/EGL/egl.pc.in | 10 ++++++++++ + src/GL/Makefile.am | 3 +++ + src/GL/gl.pc.in | 10 ++++++++++ + src/GLESv1/Makefile.am | 2 ++ + src/GLESv1/glesv1_cm.pc.in | 10 ++++++++++ + src/GLESv2/Makefile.am | 2 ++ + src/GLESv2/glesv2.pc.in | 10 ++++++++++ + src/GLX/Makefile.am | 2 ++ + src/GLX/glx.pc.in | 10 ++++++++++ + src/OpenGL/Makefile.am | 2 ++ + src/OpenGL/opengl.pc.in | 10 ++++++++++ + 13 files changed, 80 insertions(+) + create mode 100644 src/EGL/egl.pc.in + create mode 100644 src/GL/gl.pc.in + create mode 100644 src/GLESv1/glesv1_cm.pc.in + create mode 100644 src/GLESv2/glesv2.pc.in + create mode 100644 src/GLX/glx.pc.in + create mode 100644 src/OpenGL/opengl.pc.in + +diff --git a/configure.ac b/configure.ac +index cdbb138..7feec30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -324,11 +324,17 @@ AC_CONFIG_FILES([Makefile + include/Makefile + src/Makefile + src/GL/Makefile ++ src/GL/gl.pc ++ src/OpenGL/opengl.pc + src/OpenGL/Makefile ++ src/GLESv1/glesv1_cm.pc + src/GLESv1/Makefile ++ src/GLESv2/glesv2.pc + src/GLESv2/Makefile ++ src/GLX/glx.pc + src/GLX/Makefile + src/EGL/Makefile ++ src/EGL/egl.pc + src/GLdispatch/Makefile + src/GLdispatch/vnd-glapi/Makefile + src/util/Makefile +diff --git a/src/EGL/Makefile.am b/src/EGL/Makefile.am +index 5c036dc..c55c83e 100644 +--- a/src/EGL/Makefile.am ++++ b/src/EGL/Makefile.am +@@ -106,3 +106,6 @@ g_egldispatchstubs.c : $(GENERATE_DEPS) + g_egldispatchstubs.h : $(GENERATE_DEPS) + $(AM_V_GEN)$(PYTHON) $(GENERATE_DISPATCH_SCRIPT) header $(GENERATE_LIST_FILES) > $@ + endif ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = egl.pc +diff --git a/src/EGL/egl.pc.in b/src/EGL/egl.pc.in +new file mode 100644 +index 0000000..ffae9e2 +--- /dev/null ++++ b/src/EGL/egl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: egl ++Description: EGL library and headers ++Version: 1.5 ++Libs: -L${libdir} -lEGL ++Cflags: -I${includedir} +diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am +index ecdcbd0..225fdcb 100644 +--- a/src/GL/Makefile.am ++++ b/src/GL/Makefile.am +@@ -70,3 +70,6 @@ libGL_la_LIBADD += ../GLdispatch/libGLdispatch.la + libGL_la_LIBADD += ../GLdispatch/vnd-glapi/libglapi_gl.la + libGL_la_LIBADD += ../util/libutils_misc.la + libGL_la_LIBADD += @LIB_DL@ ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = gl.pc +diff --git a/src/GL/gl.pc.in b/src/GL/gl.pc.in +new file mode 100644 +index 0000000..0eaa149 +--- /dev/null ++++ b/src/GL/gl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: gl ++Description: Legacy OpenGL and GLX library and headers ++Version: 1.2 ++Libs: -L${libdir} -lGL ++Cflags: -I${includedir} +diff --git a/src/GLESv1/Makefile.am b/src/GLESv1/Makefile.am +index d20017d..88e07bc 100644 +--- a/src/GLESv1/Makefile.am ++++ b/src/GLESv1/Makefile.am +@@ -38,3 +38,5 @@ libGLESv1_CM_la_LIBADD = \ + ../GLdispatch/vnd-glapi/libglapi_glesv1.la \ + ../util/libutils_misc.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glesv1_cm.pc +diff --git a/src/GLESv1/glesv1_cm.pc.in b/src/GLESv1/glesv1_cm.pc.in +new file mode 100644 +index 0000000..daa247f +--- /dev/null ++++ b/src/GLESv1/glesv1_cm.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: glesv1_cm ++Description: OpenGL ES-CM v1 library and headers ++Version: 1.0 ++Libs: -L${libdir} -lGLESv1_CM ++Cflags: -I${includedir} +diff --git a/src/GLESv2/Makefile.am b/src/GLESv2/Makefile.am +index a9c2351..f40e06f 100644 +--- a/src/GLESv2/Makefile.am ++++ b/src/GLESv2/Makefile.am +@@ -38,3 +38,5 @@ libGLESv2_la_LIBADD = \ + ../GLdispatch/vnd-glapi/libglapi_glesv2.la \ + ../util/libutils_misc.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glesv2.pc +diff --git a/src/GLESv2/glesv2.pc.in b/src/GLESv2/glesv2.pc.in +new file mode 100644 +index 0000000..a9fe839 +--- /dev/null ++++ b/src/GLESv2/glesv2.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: gles2 ++Description: OpenGL ES v2/v3 library and headers ++Version: 3.2 ++Libs: -L${libdir} -lGLESv2 ++Cflags: -I${includedir} +diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am +index 030836b..0d19674 100644 +--- a/src/GLX/Makefile.am ++++ b/src/GLX/Makefile.am +@@ -69,3 +69,5 @@ libGLX_la_SOURCES = \ + libglxmapping.c \ + libglxproto.c + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glx.pc +diff --git a/src/GLX/glx.pc.in b/src/GLX/glx.pc.in +new file mode 100644 +index 0000000..1561181 +--- /dev/null ++++ b/src/GLX/glx.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: glx ++Description: GLX library and headers ++Version: 1.4 ++Libs: -L${libdir} -lGLX ++Cflags: -I${includedir} +diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am +index 647d9e4..4b34dd5 100644 +--- a/src/OpenGL/Makefile.am ++++ b/src/OpenGL/Makefile.am +@@ -47,3 +47,5 @@ libOpenGL_la_LIBADD = \ + ../GLdispatch/vnd-glapi/libglapi_opengl.la \ + ../util/libutils_misc.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = opengl.pc +diff --git a/src/OpenGL/opengl.pc.in b/src/OpenGL/opengl.pc.in +new file mode 100644 +index 0000000..d560c06 +--- /dev/null ++++ b/src/OpenGL/opengl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: opengl ++Description: OpenGL (without GLX) headers and interface ++Version: 4.5 ++Libs: -L${libdir} -lOpenGL ++Cflags: -I${includedir} +-- +2.21.0 + diff --git a/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild new file mode 100644 index 000000000000..090fdd736c49 --- /dev/null +++ b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 2018-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1 + +DESCRIPTION="The GL Vendor-Neutral Dispatch library" +HOMEPAGE="https://github.com/NVIDIA/libglvnd" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND=" + !media-libs/mesa[-libglvnd(-)] + !<media-libs/mesa-19.2.0_rc1 + x11-libs/libX11[${MULTILIB_USEDEP}] + " +DEPEND="${PYTHON_DEPS} + ${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf +} + +multilib_src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +multilib_src_test() { + emake check +} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 06d061f5f1be..10d7c3100f14 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,8 +1,16 @@ DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15 +<<<<<<< HEAD +DIST mesa-19.2.0-rc4.tar.xz 11458940 BLAKE2B e173143f01efbbe98e11d37be4e66ac5d1fb739f15796cd25b6fee3b86cb384803e21d9b65880f7b0ccbd51f956e5cf5c99a2edbf5ec1ff472a90cf26bb7640b SHA512 a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b +EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d +EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112 +EBUILD mesa-19.2.0_rc4.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d +EBUILD mesa-9999.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d +======= DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0 EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112 EBUILD mesa-19.2.0.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a EBUILD mesa-9999.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a +>>>>>>> next MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72 diff --git a/media-libs/mesa/mesa-19.2.0_rc4.ebuild b/media-libs/mesa/mesa-19.2.0_rc4.ebuild new file mode 100644 index 000000000000..b7b3a5803880 --- /dev/null +++ b/media-libs/mesa/mesa-19.2.0_rc4.ebuild @@ -0,0 +1,543 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) + +inherit llvm meson multilib-minimal pax-utils python-any-r1 + +OPENGL_DIR="xorg-x11" + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind + vdpau vulkan vulkan-overlay wayland +X xa xvmc" + +REQUIRED_USE=" + d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + vulkan? ( dri3 + || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) + video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_iris? ( gallium ) + video_cards_lima? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_panfrost? ( gallium ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99" +RDEPEND=" + !app-eselect/eselect-mesa + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + libglvnd? ( + media-libs/libglvnd[${MULTILIB_USEDEP}] + !app-eselect/eselect-opengl + ) + !libglvnd? ( + >=app-eselect/eselect-opengl-1.3.0 + ) + gallium? ( + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + wayland? ( + >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="10" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + sys-devel/llvm:8[${MULTILIB_USEDEP}] + sys-devel/llvm:7[${MULTILIB_USEDEP}] + ) + sys-devel/llvm:=[${MULTILIB_USEDEP}] +" +LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} +CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +RDEPEND="${RDEPEND} + llvm? ( + opencl? ( + video_cards_r600? ( + ${CLANG_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${CLANG_DEPSTR} + ) + ) + ) + ) + !opencl? ( + video_cards_r600? ( + ${LLVM_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) + ) + ) + ) + ) +" +unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} + +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=sys-devel/gcc-4.6 + ) + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi +} + +python_check_deps() { + has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) + + if use gallium; then + emesonargs+=( + $(meson_use llvm) + $(meson_use lm-sensors lmsensors) + $(meson_use unwind libunwind) + ) + + if use video_cards_iris || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=false) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=false) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=false) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_use xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=false) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_iris iris + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if [[ ${ABI} == x86 ]]; then + emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=true + $(meson_use dri3) + $(meson_use egl) + $(meson_use gbm) + $(meson_use gles1) + $(meson_use gles2) + $(meson_use libglvnd glvnd) + $(meson_use selinux) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +multilib_src_test() { + meson test -v -C "${BUILD_DIR}" -t 100 +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz Binary files differindex aef10343fd97..67a30bcd28fa 100644 --- a/media-plugins/Manifest.gz +++ b/media-plugins/Manifest.gz diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex 9396ff47e11e..76668bb5af0a 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index ea5862bf938f..02f1edf022b9 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -2,7 +2,11 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961 DIST mpd-0.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9 +<<<<<<< HEAD +EBUILD mpd-0.21.14.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf +======= DIST mpd-0.21.15.tar.xz 673056 BLAKE2B e399c0439e790ac62525b33c5d2d26b47d36687edc877169934dd5379646d1d38ed7fec75532498a4c0f6e51e355e872847873045ae2446d037cce8781be3067 SHA512 c67ebdb7609b36b4b8504ce0751ca2dcc38a2fba03a5b8419185e8be64bce7e19560347a600773b65f55ba0a3cedeff051117071db8e7fe0a90c9771de8bd37e EBUILD mpd-0.21.14.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf EBUILD mpd-0.21.15.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62 +>>>>>>> next MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex db88a8c9012d..4944be4062cb 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 7b44c89bfbfb..0c50b9e05ea8 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,6 +1,10 @@ DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8 EBUILD mkvtoolnix-35.0.0.ebuild 2673 BLAKE2B 2e0f0339434a91911d6b09541c1e1ea0a33deb365e82c13cd97a976c0ffff08a340d2402bd5a6949d24a9565e2406c5403a684f582068eb505494938fda9a89e SHA512 55744b23a1f061e14601d157309615bed32a282a0d6c3b84aa2dd1212cdcaf264d6e6b28f345bfbef16759c01e3f88e20457ccb0de40ee2d9f86569dadbb5f06 +<<<<<<< HEAD +EBUILD mkvtoolnix-37.0.0.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563 +======= EBUILD mkvtoolnix-37.0.0.ebuild 2609 BLAKE2B 0b11227821e40722646ce98f05cc1c54ac5667672c8959e1174de4beeaa446a6bd4450c363ada5aa3dac00e96bffb1c045c73183c592d489412c2edbd26a0c6e SHA512 86748441100688abb58bfc748119a95cfb9f6ed9de1ebfc2f43d9233d0e88a5410cde46e9645d5a9c93995d6288e3d666346f324a888f1a78dd63b76a8e23424 +>>>>>>> next EBUILD mkvtoolnix-9999.ebuild 2610 BLAKE2B 49af0fe580bda9d5317933a9ff81ca2083a52003dc1ae840eb15993910901dabc760c907eedb568a608b1f21ba492dab7538b08a51381f4a72b879a373ce86a6 SHA512 bd3b475b421f12790d703ade528eade5640d97591a0fbeedb2387690bfddbe1a395e15e75fce6de6b01aaacb7d25874abae9750b5c964d24761efae693e0a563 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild index dd854d6fd514..ffdf966c2335 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild @@ -11,7 +11,11 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" +<<<<<<< HEAD + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +======= KEYWORDS="~amd64 ~ppc ppc64 ~x86" +>>>>>>> next fi DESCRIPTION="Tools to create, alter, and inspect Matroska files" diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 0e87f382fe33..96ffd053d456 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -11,4 +11,8 @@ DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae0 EBUILD mpv-0.27.2.ebuild 10639 BLAKE2B d5b64552973347ec3ac9423029dfec5448cb2c36e7cdfd293c2a61fa4d4fe9fb59837719eae234c5f46eb4396ef3f409669a2b1a5da62f59fc90712e912ecd72 SHA512 ebd5a47f15408583f1dfe1a9fefe40a2b0fcf968f6a71b5c603d5bd85187f51cee926f6f1cb6746050715b2aea64bddc4771ebccf307f1ec1d3f466e31e3658b EBUILD mpv-0.29.1-r1.ebuild 10296 BLAKE2B e683008242a323ec31bbdcc73b823e65ad6b296687f1832e8d6f85a571c029b67780e4440ca52a12252edb6e5f7a0feb022ee742a187280002862a28e00f2f85 SHA512 5e03a94e4640b82b33a7099034450dc942dcdd9b2b9215172c8c426cfd0437b5f2e5ced09aea27593ead91694f8dd2913dbb396d8d25b0b5315320acfb0990aa EBUILD mpv-9999.ebuild 10323 BLAKE2B fceb344df0fe5a8f600db00cabe4c64985de7db4b15c3eea31c492f9f41ede8cbf91d072e19bc5b323f0e71e13d1bcc633dbb59d8c689df8d39744eb0ea8ea9a SHA512 14ae91c3b6e08361fab33987998471d0dc9b6c9a3ddd5cc2fac0e66b6f55db78fe0ac0170b5b3544853194edb0dd2612505637c7b1682136e1129f175d54e10f +<<<<<<< HEAD +MISC metadata.xml 2207 BLAKE2B 41d54819efc59037d5d086dec0f47f85d19d784c59db5dd54b30fe4334d2e58225a6a97dc5b71f257f95b36557268d2896a537f1ca7ac02c84fab52b90df502f SHA512 c64d32e92d343682154ad564a094bd045c22822272a32694aa37aed52b230fcf141013940e69fc8604b3f8a7a54b73d8b4c9b227365fa84cfb68a1680ba96767 +======= MISC metadata.xml 2195 BLAKE2B 2cb6ef92e3152efff57b7284f907512fe5ccccd38bff5ddbff746565780636478016312b9612dc817613e4bfc3b5818d4e919a16bb4ba12b85f8fce797dac1f7 SHA512 5d771852f9431e46301fe644a407c1c800c4cf1b9bc7a274d03822f999c5c3366b738e4678f400e05fb6ac5cffb8ad98007a7ac9c369889d08a7fece9ec72e16 +>>>>>>> next diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 61ab5a1fe43a..78824a7b5960 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> +<<<<<<< HEAD + <maintainer type="project"> + <email>media-video@gentoo.org</email> + <name>Gentoo Video project</name> +======= <maintainer type="person"> <email>zlogene@gentoo.org</email> <name>Mikle Kolyada</name> +>>>>>>> next </maintainer> <use> <flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag> diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz Binary files differindex 65883f28c245..df87323da3e4 100644 --- a/metadata/Manifest.gz +++ b/metadata/Manifest.gz diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 53bcac13ce10..e5e5d106f537 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1,5 @@ +<<<<<<< HEAD +Wed, 25 Sep 2019 17:39:00 +0000 +======= Sat, 28 Sep 2019 05:08:57 +0000 +>>>>>>> next diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest index 84cc38ef3d4e..e080c3f8d357 100644 --- a/metadata/glsa/Manifest +++ b/metadata/glsa/Manifest @@ -2,6 +2,26 @@ Hash: SHA512 MANIFEST Manifest.files.gz 448845 BLAKE2B 24feded351e2c02762000f35c6c58ac935b2383bf6acdd7450f974e16e15fe0935d3f657233d5cd4ab87639ad5f410b8ea36fd5c019b93bfbfc47983ef01dbdc SHA512 569d13495f7e4953afefd29435d7953d3afa1815ae86459c1f4f84726efaaedc5598835f415738d792d2d1060be50cf8ad9140b7fcf124dd7f9ea681a55957ab +<<<<<<< HEAD +TIMESTAMP 2019-09-25T17:39:04Z +-----BEGIN PGP SIGNATURE----- + +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2LpjhfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx +RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY +klCKeQ/+KL1kbDVqrKgaAGzaEi1UfXR4kzOMUrA/VhCa2f4inWI39g6vIciEEo5W +uI8fKTAqoEBoyOukBvt8jZmZJ6sXwoQx394k0e0+dTjTLnZJ4OzySPjy45z8bFXY +kl2dTVnl51wu8dvHMDuKRcpdHj1UFTNofCOhpwYSn8DtoSr3SLYV86djbtlUZVNM +FgxqNuT8xQq1Q5xFq3IZjpknmnm/y9rF3JGXf2ztAJAhuHbo0fvtmxS5PS58I4BJ +gvH8TRL4J5YzhAhCju15UOIjEeuN5gEyT94FrmRHr4zdRdqzyrWeqZq983kwnhPp +T95YVz92p6Tt9hYUc8B5iqjKKbb5ZWXq7VrUNIeDcac0b73j1ZHYn9tnsTHAbfp2 +/2FKTgHqTmWIR/3pFpepc7CrCdngKNYpHMf8tsUcwMaj5qsUAytdiURkzru5U7wm +ainFtygwYlhSYGH40Zps67MtQIUm18XclgIUt8fA7texLNWU9caiDh5+KbU8vait +ZNiXhyj0GUCCGE7MhPS/5iICaIKnCyQz+euxeGdgBm5W7DeCzPu3aFoEgX205eVS +C5nS5G3MWndBkTOd0i1qb7YpZiAxGlTf0E8tsrTnq+pVDy9TiRXo+44V70bZHP2Z +gl6NFdRjzh7Bp/eUhVz4vv/j04OiGKc95HrCDqmKc4rwEMSkuPI= +=2rpH +======= TIMESTAMP 2019-09-28T05:09:01Z -----BEGIN PGP SIGNATURE----- @@ -20,4 +40,5 @@ avOVZVt0EpZP103Ya7zlFgtTa46DyCnax7lYSvCUFtA3apjsjfdmKANeAhqyOR9Z ucbzyrFT9aLDnPW4Fk2+QL3eLuJ2KVteYgh0UgBXEsk4dLiasbYNh+P5IOTFUq2N J7pPfqkCrOs5A1SakV4Jv2q9dAAzC5l2oIyXEd4apQndBef87/c= =ArAv +>>>>>>> next -----END PGP SIGNATURE----- diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 53bcac13ce10..e5e5d106f537 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1,5 @@ +<<<<<<< HEAD +Wed, 25 Sep 2019 17:39:00 +0000 +======= Sat, 28 Sep 2019 05:08:57 +0000 +>>>>>>> next diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz Binary files differindex aebf63be8abb..ff831fafa8ad 100644 --- a/metadata/md5-cache/Manifest.gz +++ b/metadata/md5-cache/Manifest.gz diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz Binary files differindex 1bc4277e5f3d..c144c5fbaf4c 100644 --- a/metadata/md5-cache/acct-group/Manifest.gz +++ b/metadata/md5-cache/acct-group/Manifest.gz diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz Binary files differindex 7cbb03ae0646..1cdaee39e7c1 100644 --- a/metadata/md5-cache/acct-user/Manifest.gz +++ b/metadata/md5-cache/acct-user/Manifest.gz diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz Binary files differindex 91a77d6a63b5..0c90ca553a5f 100644 --- a/metadata/md5-cache/app-accessibility/Manifest.gz +++ b/metadata/md5-cache/app-accessibility/Manifest.gz diff --git a/metadata/md5-cache/app-accessibility/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999 index 8e62cbb1b12a..1701c1223acd 100644 --- a/metadata/md5-cache/app-accessibility/simon-9999 +++ b/metadata/md5-cache/app-accessibility/simon-9999 @@ -9,5 +9,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/okular-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0f4aefdaf7781d2189b42c9489e0d802 diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz Binary files differindex c5effd2d4119..79124d36ca3a 100644 --- a/metadata/md5-cache/app-admin/Manifest.gz +++ b/metadata/md5-cache/app-admin/Manifest.gz diff --git a/metadata/md5-cache/app-admin/calamares-3.2.12 b/metadata/md5-cache/app-admin/calamares-3.2.12 index f08394cd3449..9c7603e5af78 100644 --- a/metadata/md5-cache/app-admin/calamares-3.2.12 +++ b/metadata/md5-cache/app-admin/calamares-3.2.12 @@ -11,5 +11,9 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 ) SLOT=5 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.12/calamares-3.2.12.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3354459cf924be6e66222f158a364255 diff --git a/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1-r1 b/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1-r1 index 8df688d5763f..443ac5e13d62 100644 --- a/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1-r1 +++ b/metadata/md5-cache/app-admin/gtkdiskfree-2.0.1-r1 @@ -9,5 +9,9 @@ LICENSE=GPL-2+ RDEPEND=x11-libs/gtk+:3 SLOT=0 SRC_URI=mirror://gentoo/gtkdiskfree-2.0.1.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=89d1eb65209f61a55248a35d8d28cca7 diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0 index 3b1324c7d706..f28be7a24411 100644 --- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 +++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-apps/systemd:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aa8538b75ac40c577f1703659e18ac5d diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz Binary files differindex d9ce85a68bfd..f02f255d1d7a 100644 --- a/metadata/md5-cache/app-antivirus/Manifest.gz +++ b/metadata/md5-cache/app-antivirus/Manifest.gz diff --git a/metadata/md5-cache/app-antivirus/skyldav-0.7 b/metadata/md5-cache/app-antivirus/skyldav-0.7 index 85e590f3a216..e35de7bf94fa 100644 --- a/metadata/md5-cache/app-antivirus/skyldav-0.7 +++ b/metadata/md5-cache/app-antivirus/skyldav-0.7 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0 RDEPEND=>=app-antivirus/clamav-0.97.8 sys-apps/util-linux sys-libs/libcap libnotify? ( media-libs/libcanberra[gtk] x11-libs/libnotify x11-libs/gtk+:2 ) kernel_linux? ( virtual/modutils ) SLOT=0 SRC_URI=https://github.com/xypron/skyldav/archive/0.7.tar.gz -> skyldav-0.7.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=0b1e22da07652fa0a32fe35589937ade diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz Binary files differindex be2718f2410a..8c4710d28b56 100644 --- a/metadata/md5-cache/app-arch/Manifest.gz +++ b/metadata/md5-cache/app-arch/Manifest.gz diff --git a/metadata/md5-cache/app-arch/innoextract-1.8 b/metadata/md5-cache/app-arch/innoextract-1.8 index 4597658bd42d..35d46fa8c1ce 100644 --- a/metadata/md5-cache/app-arch/innoextract-1.8 +++ b/metadata/md5-cache/app-arch/innoextract-1.8 @@ -10,5 +10,9 @@ LICENSE=ZLIB RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils ) SLOT=0 SRC_URI=https://constexpr.org/innoextract/files/innoextract-1.8.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1d5bf22aa5dcb3f285feb1e955b3e250 diff --git a/metadata/md5-cache/app-arch/libpar2-0.4 b/metadata/md5-cache/app-arch/libpar2-0.4 index 60cd07cf7613..d7e6de669495 100644 --- a/metadata/md5-cache/app-arch/libpar2-0.4 +++ b/metadata/md5-cache/app-arch/libpar2-0.4 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/libsigc++:2 SLOT=0 SRC_URI=https://launchpad.net/libpar2/trunk/0.4/+download/libpar2-0.4.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=76a41989dfed6bf9269353979119b995 diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2 index 8115854ba4e0..8297fe8876ee 100644 --- a/metadata/md5-cache/app-arch/lz4-1.9.2 +++ b/metadata/md5-cache/app-arch/lz4-1.9.2 @@ -4,9 +4,18 @@ DESCRIPTION=Extremely Fast Compression algorithm EAPI=7 HOMEPAGE=https://github.com/lz4/lz4 IUSE=static-libs 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 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=BSD-2 GPL-2 +SLOT=0/r132 +SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=8e6924aa9590ed68f1af3a9a97b883d7 +======= 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 LICENSE=BSD-2 GPL-2 SLOT=0/r132 SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=0315518d8644be39545aafd314f4a0e8 +>>>>>>> next diff --git a/metadata/md5-cache/app-arch/unrar-5.7.5 b/metadata/md5-cache/app-arch/unrar-5.7.5 index dfc149f8fa6f..9915998377c2 100644 --- a/metadata/md5-cache/app-arch/unrar-5.7.5 +++ b/metadata/md5-cache/app-arch/unrar-5.7.5 @@ -7,5 +7,9 @@ LICENSE=unRAR RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417 SLOT=0/5 SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.7.5.tar.gz -> unrar-5.7.5.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=a8e860dca750afc087da2445002befb9 diff --git a/metadata/md5-cache/app-arch/xar-1.8-r2 b/metadata/md5-cache/app-arch/xar-1.8-r2 index f6984b7444df..ff4e4e83154f 100644 --- a/metadata/md5-cache/app-arch/xar-1.8-r2 +++ b/metadata/md5-cache/app-arch/xar-1.8-r2 @@ -9,5 +9,9 @@ LICENSE=BSD-2 RDEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[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(-)?] ) libressl? ( dev-libs/libressl:0=[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(-)?] ) ) app-arch/bzip2[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(-)?] sys-libs/zlib[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(-)?] dev-libs/libxml2[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(-)?] SLOT=0 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-400.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=a262925c8414b0f0444faf7e13f50c54 diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz Binary files differindex 78e53ec1c9b7..b8310796ff00 100644 --- a/metadata/md5-cache/app-backup/Manifest.gz +++ b/metadata/md5-cache/app-backup/Manifest.gz diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1 index 4a327ebefd9a..5a3778587a5b 100644 --- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 +++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1 @@ -10,5 +10,9 @@ LICENSE=GPL-3 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2de8ead9db4cd752c4130079f5a549bc diff --git a/metadata/md5-cache/app-backup/kup-0.7.3 b/metadata/md5-cache/app-backup/kup-0.7.3 index f9d8f5b31252..9acfdaa0df8e 100644 --- a/metadata/md5-cache/app-backup/kup-0.7.3 +++ b/metadata/md5-cache/app-backup/kup-0.7.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgit2:= >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 app-backup/bup net-misc/rsync !app-text/kup >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/spersson/Kup/archive/kup-0.7.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d560a94751e0b03530c163cdb3883d18 diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz Binary files differindex 4c397ebcc5bd..fa60eec005ac 100644 --- a/metadata/md5-cache/app-benchmarks/Manifest.gz +++ b/metadata/md5-cache/app-benchmarks/Manifest.gz diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz Binary files differindex c989029b2860..ed7130ef8502 100644 --- a/metadata/md5-cache/app-cdr/Manifest.gz +++ b/metadata/md5-cache/app-cdr/Manifest.gz diff --git a/metadata/md5-cache/app-cdr/isoimagewriter-0.8 b/metadata/md5-cache/app-cdr/isoimagewriter-0.8 index c8dfe1c54411..824cd70500ce 100644 --- a/metadata/md5-cache/app-cdr/isoimagewriter-0.8 +++ b/metadata/md5-cache/app-cdr/isoimagewriter-0.8 @@ -10,5 +10,9 @@ LICENSE=GPL-3 RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/isoimagewriter/0.8/isoimagewriter-0.8.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a116ae9e5da32a5708eba3fa47c459e6 diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.3 b/metadata/md5-cache/app-cdr/kcdemu-0.7.3 index 573334131276..4b733bfa2973 100644 --- a/metadata/md5-cache/app-cdr/kcdemu-0.7.3 +++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dl.opendesktop.org/api/files/downloadfile/id/1511553040/o/1/s/3e4f95734673128605fc1d8721894a1c/t/1517011407/u/65804/kde_cdemu-0.7.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7b2850c24338c65a0204b29cf6c8f8be 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 diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz Binary files differindex 6449c5e5e8a6..c3abc96cf4b9 100644 --- a/metadata/md5-cache/app-dicts/Manifest.gz +++ b/metadata/md5-cache/app-dicts/Manifest.gz diff --git a/metadata/md5-cache/app-dicts/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1 index 500b3996e799..f36bed48b989 100644 --- a/metadata/md5-cache/app-dicts/dikt-2s_p1 +++ b/metadata/md5-cache/app-dicts/dikt-2s_p1 @@ -10,5 +10,9 @@ LICENSE=BSD-2 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4aece435a30e77b89a00d25b1a2821be diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz Binary files differindex 6734f5036da4..ca2be9787c98 100644 --- a/metadata/md5-cache/app-doc/Manifest.gz +++ b/metadata/md5-cache/app-doc/Manifest.gz diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz Binary files differindex 79c40b5d56cb..d02c975d28ed 100644 --- a/metadata/md5-cache/app-editors/Manifest.gz +++ b/metadata/md5-cache/app-editors/Manifest.gz diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r18 b/metadata/md5-cache/app-editors/emacs-23.4-r18 index b83ad686a124..68726ea55e9e 100644 --- a/metadata/md5-cache/app-editors/emacs-23.4-r18 +++ b/metadata/md5-cache/app-editors/emacs-23.4-r18 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=23 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=a9c83ad8483a783393a3d4bcb54b0d61 diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r7 b/metadata/md5-cache/app-editors/emacs-24.5-r7 index b5ca6e007150..46b347f6bf26 100644 --- a/metadata/md5-cache/app-editors/emacs-24.5-r7 +++ b/metadata/md5-cache/app-editors/emacs-24.5-r7 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=24 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=0b497670bbdb4539e855211e49839a4b diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6 index b9d871fa79eb..988dba924a08 100644 --- a/metadata/md5-cache/app-editors/emacs-25.3-r6 +++ b/metadata/md5-cache/app-editors/emacs-25.3-r6 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=25 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=7973e5fc40afb8a3b03a6c58cf20a121 diff --git a/metadata/md5-cache/app-editors/emacs-26.1-r3 b/metadata/md5-cache/app-editors/emacs-26.1-r3 index 0a052044f9ed..8437a9e81978 100644 --- a/metadata/md5-cache/app-editors/emacs-26.1-r3 +++ b/metadata/md5-cache/app-editors/emacs-26.1-r3 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=26 SRC_URI=mirror://gnu/emacs/emacs-26.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.1-patches-2.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=cdc8c5a16bfc789a6f7ba2664b066ca5 diff --git a/metadata/md5-cache/app-editors/emacs-26.2 b/metadata/md5-cache/app-editors/emacs-26.2 index efb68b3a1720..4b3ff1af51d4 100644 --- a/metadata/md5-cache/app-editors/emacs-26.2 +++ b/metadata/md5-cache/app-editors/emacs-26.2 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=26 SRC_URI=mirror://gnu/emacs/emacs-26.2.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=d58abea4f2b6179b86d718167472a897 diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r1 b/metadata/md5-cache/app-editors/emacs-26.3-r1 index c8437893bc64..383b86073c6e 100644 --- a/metadata/md5-cache/app-editors/emacs-26.3-r1 +++ b/metadata/md5-cache/app-editors/emacs-26.3-r1 @@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) SLOT=26 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=8270c70aa056141b641934e1ccc153ee diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.3.9999 b/metadata/md5-cache/app-editors/emacs-vcs-26.3.9999 index 5b93fbf0868d..1e826c4c472c 100644 --- a/metadata/md5-cache/app-editors/emacs-vcs-26.3.9999 +++ b/metadata/md5-cache/app-editors/emacs-vcs-26.3.9999 @@ -10,5 +10,5 @@ PROPERTIES=live RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) REQUIRED_USE=?? ( aqua X ) SLOT=26 -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=231f5dc2888f11c3b44c8497f1a4d7ed diff --git a/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180831 b/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180831 index a162047d9e99..6ebd96d11174 100644 --- a/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180831 +++ b/metadata/md5-cache/app-editors/emacs-vcs-27.0.50_pre20180831 @@ -12,5 +12,9 @@ REQUIRED_USE=?? ( aqua X ) RESTRICT=test SLOT=27 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.50_pre20180831.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.50_pre20180831.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=aa1604a6bbfc5f68aea4234033c46035 diff --git a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 index a441e7488104..5c57185a181e 100644 --- a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 +++ b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-c REQUIRED_USE=?? ( aqua X ) RESTRICT=test SLOT=27 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=06c385b4488669f27f0aefa349898398 diff --git a/metadata/md5-cache/app-editors/kile-2.9.92_p20190716 b/metadata/md5-cache/app-editors/kile-2.9.92_p20190716 index 1288a447e72b..c3c9a900b8f8 100644 --- a/metadata/md5-cache/app-editors/kile-2.9.92_p20190716 +++ b/metadata/md5-cache/app-editors/kile-2.9.92_p20190716 @@ -10,5 +10,9 @@ LICENSE=FDL-1.2 GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdoctools-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/okular-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-19.04.3:5 >=kde-apps/okular-19.04.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kile-2.9.92_p20190716.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b1167f11d0a821365eb1026e191a6d30 diff --git a/metadata/md5-cache/app-editors/neovim-0.3.8 b/metadata/md5-cache/app-editors/neovim-0.3.8 index 6e4b842fd67c..2168c1dfca98 100644 --- a/metadata/md5-cache/app-editors/neovim-0.3.8 +++ b/metadata/md5-cache/app-editors/neovim-0.3.8 @@ -10,5 +10,9 @@ LICENSE=Apache-2.0 vim RDEPEND=dev-libs/libuv:0= <dev-libs/libvterm-0.1 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl jemalloc? ( dev-libs/jemalloc ) luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) ) SLOT=0 SRC_URI=https://github.com/neovim/neovim/archive/v0.3.8.tar.gz -> neovim-0.3.8.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3891637b913b0d8716bfa1f31514fc51 diff --git a/metadata/md5-cache/app-editors/okteta-0.26.2 b/metadata/md5-cache/app-editors/okteta-0.26.2 index db92f5a22194..8bebe0e57f37 100644 --- a/metadata/md5-cache/app-editors/okteta-0.26.2 +++ b/metadata/md5-cache/app-editors/okteta-0.26.2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/okteta/0.26.2/src/okteta-0.26.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=113469cadd8966184098d8059a104307 diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz Binary files differindex 164322d679be..e8f29257921a 100644 --- a/metadata/md5-cache/app-emacs/Manifest.gz +++ b/metadata/md5-cache/app-emacs/Manifest.gz diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz Binary files differindex 2f1c0f30f25a..d39710d886e5 100644 --- a/metadata/md5-cache/app-emulation/Manifest.gz +++ b/metadata/md5-cache/app-emulation/Manifest.gz diff --git a/metadata/md5-cache/app-emulation/faudio-9999 b/metadata/md5-cache/app-emulation/faudio-9999 index a6b1244f918e..73d15ba1a1f4 100644 --- a/metadata/md5-cache/app-emulation/faudio-9999 +++ b/metadata/md5-cache/app-emulation/faudio-9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=>=media-libs/libsdl2-2.0.9[sound,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(-)?] ffmpeg? ( media-video/ffmpeg:=[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(-)?] ) REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0c89faf9d54c7ba6c47eb6d0a0f265e1 diff --git a/metadata/md5-cache/app-emulation/libpod-1.5.1-r1 b/metadata/md5-cache/app-emulation/libpod-1.5.1-r1 index 5633e2d855c7..d9b92625eef8 100644 --- a/metadata/md5-cache/app-emulation/libpod-1.5.1-r1 +++ b/metadata/md5-cache/app-emulation/libpod-1.5.1-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=!selinux? ( !ostree ) RESTRICT=test SLOT=0 SRC_URI=https://github.com/containers/libpod/archive/v1.5.1.tar.gz -> libpod-1.5.1.tar.gz +<<<<<<< HEAD +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=01150551d0c250e3ce5f3747346cc29a diff --git a/metadata/md5-cache/app-emulation/qemu-4.0.0-r50 b/metadata/md5-cache/app-emulation/qemu-4.0.0-r50 index 81cd5afe7e2e..651f92a03dc1 100644 --- a/metadata/md5-cache/app-emulation/qemu-4.0.0-r50 +++ b/metadata/md5-cache/app-emulation/qemu-4.0.0-r50 @@ -12,4 +12,8 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe SLOT=0 SRC_URI=http://wiki.qemu-project.org/download/qemu-4.0.0.tar.xz _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +<<<<<<< HEAD +_md5_=33bb7bc5b6c680fb977045874560106c +======= _md5_=ed6bda795f37d6efef509424c2481077 +>>>>>>> next diff --git a/metadata/md5-cache/app-emulation/qemu-4.1.0 b/metadata/md5-cache/app-emulation/qemu-4.1.0 index 6b6dcc45a19b..2f66d85ca717 100644 --- a/metadata/md5-cache/app-emulation/qemu-4.1.0 +++ b/metadata/md5-cache/app-emulation/qemu-4.1.0 @@ -12,4 +12,8 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe SLOT=0 SRC_URI=http://wiki.qemu-project.org/download/qemu-4.1.0.tar.xz _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +<<<<<<< HEAD +_md5_=5db51ef7e7deaef0353b622407848f07 +======= _md5_=4b5e8ffafc2621f31c2d4aae5e568617 +>>>>>>> next diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999 index 6f2892560361..1a6db619f04c 100644 --- a/metadata/md5-cache/app-emulation/qemu-9999 +++ b/metadata/md5-cache/app-emulation/qemu-9999 @@ -11,4 +11,8 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk ) SLOT=0 _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 git-r3 562b380fc59ae6a8622171d0acb777d1 l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +<<<<<<< HEAD +_md5_=65673bcdaebcdbf3cb7e4281ff154782 +======= _md5_=084a4d9d06928141b20aa6ad14b506db +>>>>>>> next diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.32 b/metadata/md5-cache/app-emulation/virtualbox-5.2.32 index 4ffb9f959c0b..bb3d4a1c746f 100644 --- a/metadata/md5-cache/app-emulation/virtualbox-5.2.32 +++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.32 @@ -10,5 +10,9 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.32 d REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7 SLOT=0 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e88959ac17eb8583f3109c0624dcfca6 diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz Binary files differindex 0c1be8ded283..e9bf62429ea4 100644 --- a/metadata/md5-cache/app-forensics/Manifest.gz +++ b/metadata/md5-cache/app-forensics/Manifest.gz diff --git a/metadata/md5-cache/app-forensics/afl-2.55b b/metadata/md5-cache/app-forensics/afl-2.55b index ab23cfcec466..c6ee1dfb5ea0 100644 --- a/metadata/md5-cache/app-forensics/afl-2.55b +++ b/metadata/md5-cache/app-forensics/afl-2.55b @@ -8,5 +8,9 @@ LICENSE=Apache-2.0 RDEPEND=sys-devel/gcc:* sys-devel/clang:= SLOT=0 SRC_URI=https://github.com/google/AFL/archive/v2.55b.tar.gz -> afl-2.55b.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=2bebbcec978f1ae8a73fc1434e93b682 diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz Binary files differindex de09e455da00..ca90d8184990 100644 --- a/metadata/md5-cache/app-i18n/Manifest.gz +++ b/metadata/md5-cache/app-i18n/Manifest.gz diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz Binary files differindex 7039a4c0dcd3..115672891c44 100644 --- a/metadata/md5-cache/app-metrics/Manifest.gz +++ b/metadata/md5-cache/app-metrics/Manifest.gz diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz Binary files differindex 6652235e0feb..956744c5f597 100644 --- a/metadata/md5-cache/app-misc/Manifest.gz +++ b/metadata/md5-cache/app-misc/Manifest.gz diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 index b5eb47260759..87347ef93fc2 100644 --- a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 +++ b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 @@ -8,5 +8,9 @@ LICENSE=GPL-2 RDEPEND=>=sys-libs/ncurses-5.2:0= >=sys-libs/readline-4.1:0= SLOT=0 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=b55362261a3b60b40288bf790718698f diff --git a/metadata/md5-cache/app-misc/mc-4.8.23-r1 b/metadata/md5-cache/app-misc/mc-4.8.23-r1 index 510235bf659a..df9906654e53 100644 --- a/metadata/md5-cache/app-misc/mc-4.8.23-r1 +++ b/metadata/md5-cache/app-misc/mc-4.8.23-r1 @@ -10,5 +10,9 @@ RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2 REQUIRED_USE=spell? ( edit ) SLOT=0 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=d02532d62fe2899b716adfa8f2269268 diff --git a/metadata/md5-cache/app-misc/tmux-2.9a b/metadata/md5-cache/app-misc/tmux-2.9a index 327b17262721..8a055c662614 100644 --- a/metadata/md5-cache/app-misc/tmux-2.9a +++ b/metadata/md5-cache/app-misc/tmux-2.9a @@ -5,10 +5,19 @@ DESCRIPTION=Terminal multiplexer EAPI=7 HOMEPAGE=https://tmux.github.io/ IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +======= KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +>>>>>>> next LICENSE=ISC RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux ) SLOT=0 SRC_URI=https://github.com/tmux/tmux/releases/download/2.9a/tmux-2.9a.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=5396dfb591881895c775bc306cc3f1f4 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=2bfe173a65dca4642235d7a9ff30e937 +>>>>>>> next diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.8 b/metadata/md5-cache/app-misc/vcontrold-0.98.8 index 7e72461a9d29..b24e1b0393d2 100644 --- a/metadata/md5-cache/app-misc/vcontrold-0.98.8 +++ b/metadata/md5-cache/app-misc/vcontrold-0.98.8 @@ -10,5 +10,9 @@ LICENSE=GPL-3+ RDEPEND=dev-libs/libxml2:2 SLOT=0 SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.8.tar.gz -> vcontrold-0.98.8.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3b84bf816ae2172735f5d155c228db13 diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz Binary files differindex 8ee35d4ebbda..9eae869730f2 100644 --- a/metadata/md5-cache/app-office/Manifest.gz +++ b/metadata/md5-cache/app-office/Manifest.gz diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r4 b/metadata/md5-cache/app-office/calligra-3.1.0-r4 index 1a2e134e9dbb..bfec81231106 100644 --- a/metadata/md5-cache/app-office/calligra-3.1.0-r4 +++ b/metadata/md5-cache/app-office/calligra-3.1.0-r4 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >= RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=35eae8d17d5e0c0dc3f532d94da84606 diff --git a/metadata/md5-cache/app-office/calligraplan-3.1.0-r1 b/metadata/md5-cache/app-office/calligraplan-3.1.0-r1 index f51aeb97f941..4caecef99799 100644 --- a/metadata/md5-cache/app-office/calligraplan-3.1.0-r1 +++ b/metadata/md5-cache/app-office/calligraplan-3.1.0-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b4d15147736554f3ab461613bcc7456b diff --git a/metadata/md5-cache/app-office/calligraplan-3.1.0-r2 b/metadata/md5-cache/app-office/calligraplan-3.1.0-r2 index 568781484763..4159687831f4 100644 --- a/metadata/md5-cache/app-office/calligraplan-3.1.0-r2 +++ b/metadata/md5-cache/app-office/calligraplan-3.1.0-r2 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ce0800522bd3bf48efc429ed20473c2d diff --git a/metadata/md5-cache/app-office/kexi-3.2.0-r1 b/metadata/md5-cache/app-office/kexi-3.2.0-r1 index ab38d357f443..c40c3c7433e2 100644 --- a/metadata/md5-cache/app-office/kexi-3.2.0-r1 +++ b/metadata/md5-cache/app-office/kexi-3.2.0-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/breeze-icons-rcc-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-19.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0b1ebfe227f30f47a58cd0f51842ab0f diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.5 b/metadata/md5-cache/app-office/kmymoney-5.0.5 index b976a00c26e1..b132e0fa4b77 100644 --- a/metadata/md5-cache/app-office/kmymoney-5.0.5 +++ b/metadata/md5-cache/app-office/kmymoney-5.0.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >= REQUIRED_USE=weboob? ( python_targets_python2_7 ) SLOT=5 SRC_URI=mirror://kde/stable/kmymoney/5.0.5/src/kmymoney-5.0.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d3d04ff3adf77346300b3cda097ab9b0 diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.6 b/metadata/md5-cache/app-office/kmymoney-5.0.6 index 807eec9acb82..067f0a0298cf 100644 --- a/metadata/md5-cache/app-office/kmymoney-5.0.6 +++ b/metadata/md5-cache/app-office/kmymoney-5.0.6 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >= REQUIRED_USE=weboob? ( python_targets_python2_7 ) SLOT=5 SRC_URI=mirror://kde/stable/kmymoney/5.0.6/src/kmymoney-5.0.6.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3dab8a1f8f463e00f03e00cf02d9aa93 diff --git a/metadata/md5-cache/app-office/kraft-0.82 b/metadata/md5-cache/app-office/kraft-0.82 index d978eed8746f..d9d833692818 100644 --- a/metadata/md5-cache/app-office/kraft-0.82 +++ b/metadata/md5-cache/app-office/kraft-0.82 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/kcontacts-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 ) !app-office/kraft:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/dragotin/kraft/archive/v0.82.tar.gz -> kraft-0.82.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b78826446b0bd1670753f228700541d4 diff --git a/metadata/md5-cache/app-office/libalkimia-7.0.2-r1 b/metadata/md5-cache/app-office/libalkimia-7.0.2-r1 index 101d14f5f60e..1035ce0eef2a 100644 --- a/metadata/md5-cache/app-office/libalkimia-7.0.2-r1 +++ b/metadata/md5-cache/app-office/libalkimia-7.0.2-r1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 !gmp? ( sci-libs/mpir:=[cxx] ) gmp? ( dev-libs/gmp:0=[cxx] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0/7 SRC_URI=mirror://kde/stable/alkimia/7.0.2/alkimia-7.0.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c5172e1dfe2f37c1d1050ce2d1771394 diff --git a/metadata/md5-cache/app-office/lyx-2.3.3 b/metadata/md5-cache/app-office/lyx-2.3.3 index 1432a5ff16b0..3c355319d6c4 100644 --- a/metadata/md5-cache/app-office/lyx-2.3.3 +++ b/metadata/md5-cache/app-office/lyx-2.3.3 @@ -10,5 +10,9 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/ REQUIRED_USE=python_targets_python2_7 SLOT=0 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.3/lyx-2.3.3.tar.xz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=05a2c1b1a9c706c1f297acd08fd5ce30 diff --git a/metadata/md5-cache/app-office/skrooge-2.20.0 b/metadata/md5-cache/app-office/skrooge-2.20.0 index c8e7c8f4040d..fbca5920466b 100644 --- a/metadata/md5-cache/app-office/skrooge-2.20.0 +++ b/metadata/md5-cache/app-office/skrooge-2.20.0 @@ -12,5 +12,9 @@ REQUIRED_USE=test? ( designer ) RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.20.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3b7fbc351b674b7240c2ec2145949101 diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz Binary files differindex 725c566f7e72..39d4667ceafe 100644 --- a/metadata/md5-cache/app-pda/Manifest.gz +++ b/metadata/md5-cache/app-pda/Manifest.gz diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz Binary files differindex 0a2c6171b1e9..b3dcd75f2abf 100644 --- a/metadata/md5-cache/app-portage/Manifest.gz +++ b/metadata/md5-cache/app-portage/Manifest.gz diff --git a/metadata/md5-cache/app-portage/portage-utils-0.80 b/metadata/md5-cache/app-portage/portage-utils-0.80 index cba45fdab7bb..cb1822015b13 100644 --- a/metadata/md5-cache/app-portage/portage-utils-0.80 +++ b/metadata/md5-cache/app-portage/portage-utils-0.80 @@ -4,9 +4,17 @@ DESCRIPTION=Small and fast Portage helper tools written in C EAPI=6 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils IUSE=nls static openmp +qmanifest +qtegrity libressl +<<<<<<< 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 LICENSE=GPL-2 RDEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) SLOT=0 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.80.tar.xz +<<<<<<< HEAD +_md5_=df15c8466c929c7c19e6d25b03e0bcee +======= _md5_=0703284f68fc79fdd98bede2c85dc255 +>>>>>>> next diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz Binary files differindex d87b08826bcc..b5fb51e1f3b1 100644 --- a/metadata/md5-cache/app-shells/Manifest.gz +++ b/metadata/md5-cache/app-shells/Manifest.gz diff --git a/metadata/md5-cache/app-shells/zsh-5.6.2 b/metadata/md5-cache/app-shells/zsh-5.6.2 index fed352d2eab2..202e1847846d 100644 --- a/metadata/md5-cache/app-shells/zsh-5.6.2 +++ b/metadata/md5-cache/app-shells/zsh-5.6.2 @@ -10,5 +10,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers ) RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1 SLOT=0 SRC_URI=https://www.zsh.org/pub/zsh-5.6.2.tar.xz https://www.zsh.org/pub/old/zsh-5.6.2.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.6.2-doc.tar.xz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5d0efcc61e57775f8ab86853ce678f57 diff --git a/metadata/md5-cache/app-shells/zsh-5.7.1 b/metadata/md5-cache/app-shells/zsh-5.7.1 index d6cfbeb5f158..8ff4482d2cc7 100644 --- a/metadata/md5-cache/app-shells/zsh-5.7.1 +++ b/metadata/md5-cache/app-shells/zsh-5.7.1 @@ -11,5 +11,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers ) RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1 SLOT=0 SRC_URI=https://www.zsh.org/pub/zsh-5.7.1.tar.xz https://www.zsh.org/pub/old/zsh-5.7.1.tar.xz mirror://sourceforge/zsh/zsh-5.7.1.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.7.1-doc.tar.xz mirror://sourceforge/zsh/zsh-5.7.1-doc.tar.xz ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=431869bf963015d70f8a8479c194acec diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999 index 99646754daf1..07da7a176346 100644 --- a/metadata/md5-cache/app-shells/zsh-9999 +++ b/metadata/md5-cache/app-shells/zsh-9999 @@ -10,5 +10,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers ) PROPERTIES=live RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1 SLOT=0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5798c7b5c25728a3418de57a31fc3f69 diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz Binary files differindex 8bc215ee9008..9cb49f5ec58a 100644 --- a/metadata/md5-cache/app-text/Manifest.gz +++ b/metadata/md5-cache/app-text/Manifest.gz diff --git a/metadata/md5-cache/app-text/kbibtex-0.9 b/metadata/md5-cache/app-text/kbibtex-0.9 index b8e32f4293d2..31884c219061 100644 --- a/metadata/md5-cache/app-text/kbibtex-0.9 +++ b/metadata/md5-cache/app-text/kbibtex-0.9 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/KBibTeX/0.9/kbibtex-0.9.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=81b096dc943dc5505e9c47df70e09287 diff --git a/metadata/md5-cache/app-text/kjots-5.0.2 b/metadata/md5-cache/app-text/kjots-5.0.2 index 175a4c8dfb43..42f447b5c1a8 100644 --- a/metadata/md5-cache/app-text/kjots-5.0.2 +++ b/metadata/md5-cache/app-text/kjots-5.0.2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-notes-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt !app-text/kjots:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c56266dca0292c1e0e952112f5c2a4a8 diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r9 b/metadata/md5-cache/app-text/openjade-1.3.2-r9 index db1dde7e265b..9f5a84a490f0 100644 --- a/metadata/md5-cache/app-text/openjade-1.3.2-r9 +++ b/metadata/md5-cache/app-text/openjade-1.3.2-r9 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 >=app-text/sgml-common-0.6.3-r7 SLOT=0 SRC_URI=https://downloads.sourceforge.net/project/openjade/openjade/1.3.2/openjade-1.3.2.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e sgml-catalog-r1 d8b0f83f3e731fd3f34507d50d8bc7e2 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e sgml-catalog-r1 d8b0f83f3e731fd3f34507d50d8bc7e2 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=6b406cc83aa6f41dd1ef5324d180f97f diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz Binary files differindex 823b84a7d2a8..5dfff9932fc0 100644 --- a/metadata/md5-cache/dev-cpp/Manifest.gz +++ b/metadata/md5-cache/dev-cpp/Manifest.gz diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz Binary files differindex d9c1df44c989..98065098a17e 100644 --- a/metadata/md5-cache/dev-db/Manifest.gz +++ b/metadata/md5-cache/dev-db/Manifest.gz diff --git a/metadata/md5-cache/dev-db/kdb-3.2.0 b/metadata/md5-cache/dev-db/kdb-3.2.0 index e343ebc666b6..edd29311b2c6 100644 --- a/metadata/md5-cache/dev-db/kdb-3.2.0 +++ b/metadata/md5-cache/dev-db/kdb-3.2.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/icu:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( >=dev-qt/qtnetwork-5.12.3:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/4 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dbb1152b529610bfff76fc507e2c7480 diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.27 b/metadata/md5-cache/dev-db/mariadb-10.2.27 index da5ab690f4cc..0968459bccd2 100644 --- a/metadata/md5-cache/dev-db/mariadb-10.2.27 +++ b/metadata/md5-cache/dev-db/mariadb-10.2.27 @@ -12,5 +12,9 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc ! RESTRICT=!bindist? ( bindist ) libressl? ( test ) SLOT=0/18 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.27/source/mariadb-10.2.27.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6f7d239c2496901bfa4a61825d52c5d1 diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.18 b/metadata/md5-cache/dev-db/mariadb-10.3.18 index dcc96d191a34..56cf4ebf1786 100644 --- a/metadata/md5-cache/dev-db/mariadb-10.3.18 +++ b/metadata/md5-cache/dev-db/mariadb-10.3.18 @@ -12,5 +12,9 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc ! RESTRICT=!bindist? ( bindist ) libressl? ( test ) SLOT=0/18 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.18/source/mariadb-10.3.18.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5d68edb49c016363f59a010869b0c2df diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.8 b/metadata/md5-cache/dev-db/mariadb-10.4.8 index f8b922b31459..ea06bc46b4d1 100644 --- a/metadata/md5-cache/dev-db/mariadb-10.4.8 +++ b/metadata/md5-cache/dev-db/mariadb-10.4.8 @@ -13,5 +13,9 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc ! RESTRICT=!bindist? ( bindist ) libressl? ( test ) SLOT=0/18 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.8/source/mariadb-10.4.8.tar.gz mirror://gentoo/mysql-extras-20190731-2258Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190731-2258Z.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=17d4bd660e401042b153452321689f7f diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.14 b/metadata/md5-cache/dev-db/mongodb-3.6.14 index 375fcb19e294..2f2584336a3d 100644 --- a/metadata/md5-cache/dev-db/mongodb-3.6.14 +++ b/metadata/md5-cache/dev-db/mongodb-3.6.14 @@ -11,5 +11,9 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.14 ) RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) SLOT=0 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.14.tar.gz +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=28f42811f2d4336c3fc0218fce3abf88 diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.12 b/metadata/md5-cache/dev-db/mongodb-4.0.12 index 6186fa341302..cf8949a9a4cc 100644 --- a/metadata/md5-cache/dev-db/mongodb-4.0.12 +++ b/metadata/md5-cache/dev-db/mongodb-4.0.12 @@ -11,5 +11,10 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.12 ) RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) SLOT=0 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.12.tar.gz +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +_md5_=b5c69f137df8c9e2b9cc9e0030d61806 +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 _md5_=93e2dd1c381998c5e57af4474a94ea2a +>>>>>>> next diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.0-r2 b/metadata/md5-cache/dev-db/mongodb-4.2.0-r2 index 16a3fed9b9a5..67b1d243a2a1 100644 --- a/metadata/md5-cache/dev-db/mongodb-4.2.0-r2 +++ b/metadata/md5-cache/dev-db/mongodb-4.2.0-r2 @@ -11,5 +11,9 @@ PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.0 ) RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) SLOT=0 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.0.tar.gz +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=dbb769282c6c22444a2dde24c06e8643 diff --git a/metadata/md5-cache/dev-db/mysql-5.6.45-r2 b/metadata/md5-cache/dev-db/mysql-5.6.45-r2 index bd80c1d7fa53..e0c5db156d7f 100644 --- a/metadata/md5-cache/dev-db/mysql-5.6.45-r2 +++ b/metadata/md5-cache/dev-db/mysql-5.6.45-r2 @@ -12,5 +12,9 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl ) RESTRICT=libressl? ( test ) SLOT=0/18 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.45.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.45.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.45.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190822-1908Z.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2563f0e0248d952afe02bfe6816aaf12 diff --git a/metadata/md5-cache/dev-db/mysql-5.7.27-r1 b/metadata/md5-cache/dev-db/mysql-5.7.27-r1 index 6d667d76a40e..884519d8e339 100644 --- a/metadata/md5-cache/dev-db/mysql-5.7.27-r1 +++ b/metadata/md5-cache/dev-db/mysql-5.7.27-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl ) RESTRICT=libressl? ( test ) SLOT=0/18 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.27.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.27.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.27.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3a8f65cfe59fa86136765ce137fdae89 diff --git a/metadata/md5-cache/dev-db/postgresql-12_beta4 b/metadata/md5-cache/dev-db/postgresql-12_beta4 index fc88b09d0101..d565fec02cea 100644 --- a/metadata/md5-cache/dev-db/postgresql-12_beta4 +++ b/metadata/md5-cache/dev-db/postgresql-12_beta4 @@ -10,6 +10,6 @@ LICENSE=POSTGRESQL GPL-2 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:12 !dev-db/postgresql-base:12 !dev-db/postgresql-server:12 selinux? ( sec-policy/selinux-postgresql ) REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) SLOT=12 -SRC_URI=https://ftp.postgresql.org/pub/source/v12beta4/postgresql-12beta4.tar.bz2 -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 prefix c2993e4c430c1ee24f278983d6189501 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 -_md5_=c4b57856bfa490959f69f6f6764e4853 +SRC_URI=mirror://postgresql/source/v12beta4/postgresql-12beta4.tar.bz2 +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 prefix c2993e4c430c1ee24f278983d6189501 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +_md5_=f2f31eeca1ee95d185d6406742a4bd1b diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz Binary files differindex 1c535b0f95aa..bcea5b75978c 100644 --- a/metadata/md5-cache/dev-dotnet/Manifest.gz +++ b/metadata/md5-cache/dev-dotnet/Manifest.gz diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz Binary files differindex b37aab779ce9..d4f6a80d497c 100644 --- a/metadata/md5-cache/dev-embedded/Manifest.gz +++ b/metadata/md5-cache/dev-embedded/Manifest.gz diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz Binary files differindex ddf834ad7d3f..8525507a313d 100644 --- a/metadata/md5-cache/dev-games/Manifest.gz +++ b/metadata/md5-cache/dev-games/Manifest.gz diff --git a/metadata/md5-cache/dev-games/clanlib-2.3.7 b/metadata/md5-cache/dev-games/clanlib-2.3.7 index 32d50d9a5382..8fd7220e167e 100644 --- a/metadata/md5-cache/dev-games/clanlib-2.3.7 +++ b/metadata/md5-cache/dev-games/clanlib-2.3.7 @@ -10,5 +10,9 @@ RDEPEND=sys-libs/zlib X? ( media-libs/libpng:0 virtual/jpeg:0 media-libs/freetyp REQUIRED_USE=opengl? ( X ) SLOT=2.3 SRC_URI=http://clanlib.org/download/releases-2.0/ClanLib-2.3.7.tgz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=e0efa6de0d8eba87fd4df96de7fc97bf diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz Binary files differindex 6e154f58ebee..1aa7dd355d14 100644 --- a/metadata/md5-cache/dev-haskell/Manifest.gz +++ b/metadata/md5-cache/dev-haskell/Manifest.gz diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz Binary files differindex 8c553f03d9a8..6a49e58dbc87 100644 --- a/metadata/md5-cache/dev-java/Manifest.gz +++ b/metadata/md5-cache/dev-java/Manifest.gz diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.10.5 b/metadata/md5-cache/dev-java/ant-antlr-1.10.5 index bd9354a5b267..595756c3b268 100644 --- a/metadata/md5-cache/dev-java/ant-antlr-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=7bfba4f3b963883a506333f52c031ee4 diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.13 b/metadata/md5-cache/dev-java/ant-antlr-1.9.13 index 5f22af21e3fb..ae8c5f0a7bde 100644 --- a/metadata/md5-cache/dev-java/ant-antlr-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=7bfba4f3b963883a506333f52c031ee4 diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 index 7a6ca04ad862..0924ad0c45b6 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=10e0776610ac97b1d7bb001dd2d6febb diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 index 29d2dff4e067..fd673f8e16d5 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=10e0776610ac97b1d7bb001dd2d6febb diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 index debbc097e11b..dd4037e44b71 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9da38285e4b5e8446cdaff0dffa68f53 diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 index da91b603df6f..6227192f276d 100644 --- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9da38285e4b5e8446cdaff0dffa68f53 diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 index cc97e9ee9054..d8655604fd65 100644 --- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/a RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=63d1a4b8f05a88eee1470fabd3d70c6f diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 index 4caf951e2b48..9718778d9dd4 100644 --- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/a RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=63d1a4b8f05a88eee1470fabd3d70c6f diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 index c659da1c35c4..cdbdcfefffc6 100644 --- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=e11b229b2cab98f10f88fa3c300e1f21 diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 index adc86962f610..aee601abf6f0 100644 --- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=e11b229b2cab98f10f88fa3c300e1f21 diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 index 965f83e1d954..daeccce9cfb9 100644 --- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=fa84f88cec7fd60d5908495ccaa90345 diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 index dfcc6c17ddd3..270caacec202 100644 --- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=fa84f88cec7fd60d5908495ccaa90345 diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 index c4418969fa72..d7b9622d16db 100644 --- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=239ecc46f76e29eb927e947ed7cd2035 diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 index 7dffada62920..e5295f98676f 100644 --- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=239ecc46f76e29eb927e947ed7cd2035 diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 index a2b7dd78a2ff..aded6ff0b0f6 100644 --- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2. RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9297b0ab595190a47310f483b1111e52 diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 index 413350b3b0f1..4d1bd0a24f03 100644 --- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2. RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9297b0ab595190a47310f483b1111e52 diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 index 5d42c5a6337a..699f4dd2ab60 100644 --- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=a2fe0d69b51415f59e7391881ba3f5ac diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 index 6661fd4bc14f..e6c67651c192 100644 --- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=a2fe0d69b51415f59e7391881ba3f5ac diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 index 8b12ecce9fdf..93bff25b52a4 100644 --- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=65b3153a52d3b7558b766a6bbf9f3110 diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 index eadda0a2556b..9daf357890ea 100644 --- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=65b3153a52d3b7558b766a6bbf9f3110 diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.5 b/metadata/md5-cache/dev-java/ant-jai-1.10.5 index cb24645d6e82..83d2d4d667ac 100644 --- a/metadata/md5-cache/dev-java/ant-jai-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jai-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev- RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=c8725a4288113d01dd000972a924883d diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.13 b/metadata/md5-cache/dev-java/ant-jai-1.9.13 index 1efced486948..f045bfb3598d 100644 --- a/metadata/md5-cache/dev-java/ant-jai-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jai-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev- RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=c8725a4288113d01dd000972a924883d diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.5 b/metadata/md5-cache/dev-java/ant-javamail-1.10.5 index 9a007182c8ca..b9bc7eb9bed8 100644 --- a/metadata/md5-cache/dev-java/ant-javamail-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.5 @@ -10,5 +10,10 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/oracle-javamail:0 >=dev-java RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +_md5_=92d03e76bd80d4659bf881709c30604c +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 _md5_=4a365e271c3a765e9808013ab81f9fe0 +>>>>>>> next diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.13 b/metadata/md5-cache/dev-java/ant-javamail-1.9.13 index 3b43718de25b..ab823160873e 100644 --- a/metadata/md5-cache/dev-java/ant-javamail-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.13 @@ -10,5 +10,10 @@ RDEPEND=virtual/jdk:1.8 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0- RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +_md5_=92d03e76bd80d4659bf881709c30604c +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 _md5_=1f10e85ca46164840c366dafdb0d2eab +>>>>>>> next diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 index 9cf89865288a..5828929db98a 100644 --- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=13a7d0c32cd7d140921f5aebf6a8680c diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 index 89c1d4a04dff..642d56b8cc24 100644 --- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=13a7d0c32cd7d140921f5aebf6a8680c diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.5 b/metadata/md5-cache/dev-java/ant-jmf-1.10.5 index c43d362c35d2..f3a4dcab977a 100644 --- a/metadata/md5-cache/dev-java/ant-jmf-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.5:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=5f83eab15fbefe175f46eafee17fe6d8 diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.13 b/metadata/md5-cache/dev-java/ant-jmf-1.9.13 index cf4e94b6ef1f..00cc633853c6 100644 --- a/metadata/md5-cache/dev-java/ant-jmf-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.13:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=5f83eab15fbefe175f46eafee17fe6d8 diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.5 b/metadata/md5-cache/dev-java/ant-jsch-1.10.5 index ecb74c44f530..a49aaa1b0b93 100644 --- a/metadata/md5-cache/dev-java/ant-jsch-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=747e5f84256b8bac749e7543fc3177ab diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.13 b/metadata/md5-cache/dev-java/ant-jsch-1.9.13 index 7f8086402384..fa35b72ab759 100644 --- a/metadata/md5-cache/dev-java/ant-jsch-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=747e5f84256b8bac749e7543fc3177ab diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 b/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 index ec2632fe4cb7..11675f72bc19 100644 --- a/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 +++ b/metadata/md5-cache/dev-java/ant-junit-1.10.5-r1 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=53a91ee974cddb404cc49155f3ed439c diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 b/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 index a05f10870508..04b27211246e 100644 --- a/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 +++ b/metadata/md5-cache/dev-java/ant-junit-1.9.13-r1 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=bf5532bcaac01556ef237ce1843cdd55 diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.5 b/metadata/md5-cache/dev-java/ant-junit4-1.10.5 index f23696dc88e4..8ed75cd3f752 100644 --- a/metadata/md5-cache/dev-java/ant-junit4-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.5 >=dev-java/java-config-2.2.0 RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=dff17fd4860f0ba442c5a6350a3e52d6 diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.13 b/metadata/md5-cache/dev-java/ant-junit4-1.9.13 index f9b77f03efa7..5b611493fa54 100644 --- a/metadata/md5-cache/dev-java/ant-junit4-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.13 >=dev-java/java-config-2.2.0 RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=dff17fd4860f0ba442c5a6350a3e52d6 diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 index 6cea2c73a8b8..56351e07c9b0 100644 --- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.5:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=18c15d4d9c32d3f7e8d63914fb4e126c diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.5 b/metadata/md5-cache/dev-java/ant-swing-1.10.5 index 1298ecc5da62..031a640f7789 100644 --- a/metadata/md5-cache/dev-java/ant-swing-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-swing-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.5:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9f3aa54c7c85f6fbde2690c9f4a21491 diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.13 b/metadata/md5-cache/dev-java/ant-swing-1.9.13 index cc0e26afef2f..31a14b3693ee 100644 --- a/metadata/md5-cache/dev-java/ant-swing-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-swing-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.13:0 >=virtual/jr RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9f3aa54c7c85f6fbde2690c9f4a21491 diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.5 b/metadata/md5-cache/dev-java/ant-testutil-1.10.5 index 7dc799de5b97..96df5a5fa014 100644 --- a/metadata/md5-cache/dev-java/ant-testutil-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=ed79a8e604369909542b167ae778ce45 diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.13 b/metadata/md5-cache/dev-java/ant-testutil-1.9.13 index 374e838f5207..12fb60b93171 100644 --- a/metadata/md5-cache/dev-java/ant-testutil-1.9.13 +++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.13 @@ -10,5 +10,9 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=ed79a8e604369909542b167ae778ce45 diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.5 b/metadata/md5-cache/dev-java/ant-xz-1.10.5 index 6a3670f4f0a8..360edb8e8d8e 100644 --- a/metadata/md5-cache/dev-java/ant-xz-1.10.5 +++ b/metadata/md5-cache/dev-java/ant-xz-1.10.5 @@ -10,5 +10,9 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10 RESTRICT=test SLOT=0 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-gentoo.tar.bz2 +<<<<<<< HEAD +_eclasses_=ant-tasks c100da90b35e0e1e03c422877761e47c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=ant-tasks 758204ae9f14ff8fa7ec6641bdee6fe8 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9adc17b170049fae20da4b04ef8711e6 diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 index f9b7b4c264d5..d8185ceac5c2 100644 --- a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 +++ b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 @@ -11,5 +11,9 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media- REQUIRED_USE=javafx? ( alsa !headless-awt ) SLOT=11 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.3+7.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f0dd70aadfc82e038f48fdc75bdbe574 diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 index a8664d349922..ee65ef011037 100644 --- a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 +++ b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 @@ -11,5 +11,9 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media- REQUIRED_USE=javafx? ( alsa !headless-awt ) SLOT=11 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.4+11.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=43e62113b3436005f4fcc4a1cb086fc6 diff --git a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 index ab4ef0521d92..216e12b36d6f 100644 --- a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 +++ b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 @@ -10,5 +10,9 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 SLOT=8 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u212-b03.tar.bz2 -> openjdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u212-b03.tar.bz2 -> openjdk-corba-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u212-b03.tar.bz2 -> openjdk-hotspot-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxp-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxws-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u212-b03.tar.bz2 -> openjdk-jdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u212-b03.tar.bz2 -> openjdk-langtools-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u212-b03.tar.bz2 -> openjdk-nashorn-8.212_p03.tar.bz2 +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4f7c244e1bc52a2c2bdff6ed0169a4fb diff --git a/metadata/md5-cache/dev-java/openjdk-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-8.222_p10 index 3df87e684066..a564b9e298a1 100644 --- a/metadata/md5-cache/dev-java/openjdk-8.222_p10 +++ b/metadata/md5-cache/dev-java/openjdk-8.222_p10 @@ -10,5 +10,9 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 SLOT=8 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u222-b10.tar.bz2 -> openjdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u222-b10.tar.bz2 -> openjdk-corba-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u222-b10.tar.bz2 -> openjdk-hotspot-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxp-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxws-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u222-b10.tar.bz2 -> openjdk-jdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u222-b10.tar.bz2 -> openjdk-langtools-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u222-b10.tar.bz2 -> openjdk-nashorn-8.222_p10.tar.bz2 +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 java-vm-2 7cfcabfd055e69d3568103a4e0b0fae7 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b1fc4b3f92c4050dbcae3649986735c9 diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz Binary files differindex 4b64530bcdfc..e1cad20240ca 100644 --- a/metadata/md5-cache/dev-lang/Manifest.gz +++ b/metadata/md5-cache/dev-lang/Manifest.gz diff --git a/metadata/md5-cache/dev-lang/erlang-22.0.2-r2 b/metadata/md5-cache/dev-lang/erlang-22.0.2-r2 index 2888cd928284..53885527473f 100644 --- a/metadata/md5-cache/dev-lang/erlang-22.0.2-r2 +++ b/metadata/md5-cache/dev-lang/erlang-22.0.2-r2 @@ -9,5 +9,5 @@ LICENSE=Apache-2.0 RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 ) SLOT=0 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.0.2.tar.gz -> erlang-22.0.2.tar.gz http://erlang.org/download/otp_doc_man_22.0.tar.gz -> erlang_doc_man_22.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.0.tar.gz -> erlang_doc_html_22.0.tar.gz ) -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 _md5_=bddfb790013a03adbe2858d29821a76e diff --git a/metadata/md5-cache/dev-lang/erlang-22.0.7 b/metadata/md5-cache/dev-lang/erlang-22.0.7 index 3a08cc26a14e..297d5ecd8d82 100644 --- a/metadata/md5-cache/dev-lang/erlang-22.0.7 +++ b/metadata/md5-cache/dev-lang/erlang-22.0.7 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0 RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 ) SLOT=0 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.0.7.tar.gz -> erlang-22.0.7.tar.gz http://erlang.org/download/otp_doc_man_22.0.tar.gz -> erlang_doc_man_22.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.0.tar.gz -> erlang_doc_html_22.0.tar.gz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +>>>>>>> next _md5_=fba2ae47c581f2fc4260ef04aacb98d7 diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.14.0 b/metadata/md5-cache/dev-lang/jsonnet-0.14.0 index d995628337db..e17200e4920d 100644 --- a/metadata/md5-cache/dev-lang/jsonnet-0.14.0 +++ b/metadata/md5-cache/dev-lang/jsonnet-0.14.0 @@ -11,5 +11,9 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) SLOT=0 SRC_URI=https://github.com/google/jsonnet/archive/v0.14.0.tar.gz -> jsonnet-0.14.0.tar.gz +<<<<<<< HEAD +_eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=1c13e2e5cb6f634e01a618309b002485 diff --git a/metadata/md5-cache/dev-lang/mono-6.0.0.334 b/metadata/md5-cache/dev-lang/mono-6.0.0.334 index 5c05cd0608c1..308d6bd51445 100644 --- a/metadata/md5-cache/dev-lang/mono-6.0.0.334 +++ b/metadata/md5-cache/dev-lang/mono-6.0.0.334 @@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) SLOT=0 SRC_URI=http://download.mono-project.com/sources/mono/mono-6.0.0.334.tar.xz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=a4379f88671f7771a5e4b7f455419a48 diff --git a/metadata/md5-cache/dev-lang/php-7.1.32 b/metadata/md5-cache/dev-lang/php-7.1.32 index 79edd69239d0..31783d64a66d 100644 --- a/metadata/md5-cache/dev-lang/php-7.1.32 +++ b/metadata/md5-cache/dev-lang/php-7.1.32 @@ -11,5 +11,9 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[u REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) SLOT=7.1 SRC_URI=https://php.net/distributions/php-7.1.32.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=8c46b268d7b8ec6631dbb4b4ea85b7f6 diff --git a/metadata/md5-cache/dev-lang/php-7.4.0_rc1 b/metadata/md5-cache/dev-lang/php-7.4.0_rc1 index b6e925d81c40..62d733956c6d 100644 --- a/metadata/md5-cache/dev-lang/php-7.4.0_rc1 +++ b/metadata/md5-cache/dev-lang/php-7.4.0_rc1 @@ -11,5 +11,9 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo ) SLOT=7.4 SRC_URI=https://downloads.php.net/~derick/php-7.4.0RC1.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=ff95318893f14139ed9e29ed884b876e diff --git a/metadata/md5-cache/dev-lang/php-7.4.0_rc2 b/metadata/md5-cache/dev-lang/php-7.4.0_rc2 index c0a93c082ca0..9244f8c83189 100644 --- a/metadata/md5-cache/dev-lang/php-7.4.0_rc2 +++ b/metadata/md5-cache/dev-lang/php-7.4.0_rc2 @@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo ) SLOT=7.4 SRC_URI=https://downloads.php.net/~derick/php-7.4.0RC2.tar.xz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=ff95318893f14139ed9e29ed884b876e diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.7 b/metadata/md5-cache/dev-lang/ruby-2.4.7 index 34d6d33d5259..9aa6bdf4b2a6 100644 --- a/metadata/md5-cache/dev-lang/ruby-2.4.7 +++ b/metadata/md5-cache/dev-lang/ruby-2.4.7 @@ -11,5 +11,9 @@ PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minite RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 SLOT=2.4 SRC_URI=mirror://ruby/2.4/ruby-2.4.7.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=b37a33d24c8f29a0ee35e8699894b667 diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.6 b/metadata/md5-cache/dev-lang/ruby-2.5.6 index e2009fa8ead6..dd6bc9c942da 100644 --- a/metadata/md5-cache/dev-lang/ruby-2.5.6 +++ b/metadata/md5-cache/dev-lang/ruby-2.5.6 @@ -11,5 +11,9 @@ PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minite RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225 SLOT=2.5 SRC_URI=mirror://ruby/2.5/ruby-2.5.6.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=bd98fb76fd09893758583f2fc1f4e1f9 diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999 index 9f3f11f2669e..3b9bb994d5bb 100644 --- a/metadata/md5-cache/dev-lang/zig-9999 +++ b/metadata/md5-cache/dev-lang/zig-9999 @@ -9,5 +9,9 @@ LICENSE=MIT PROPERTIES=live RDEPEND=sys-devel/llvm:9 !experimental? ( sys-devel/llvm:9[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] ) sys-devel/clang:9 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e9136fcbf951098e4dc5f6d86f4fd129 diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz Binary files differindex 69a9be20a8a6..bec857f44a85 100644 --- a/metadata/md5-cache/dev-libs/Manifest.gz +++ b/metadata/md5-cache/dev-libs/Manifest.gz diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 index 4d501961f30b..fba6b82c11af 100644 --- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 +++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) SLOT=0 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=b7e7a28a93917bdd72012be318183feb diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999 index 4e7ca57c217e..a33965f0fbbe 100644 --- a/metadata/md5-cache/dev-libs/OpenNI2-9999 +++ b/metadata/md5-cache/dev-libs/OpenNI2-9999 @@ -8,5 +8,9 @@ LICENSE=Apache-2.0 PROPERTIES=live RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) SLOT=0 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=a3bb921af0b1cd48215784be809d7c3a diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0 index 1e0a6283f088..214c253ee6f4 100644 --- a/metadata/md5-cache/dev-libs/atcore-1.0.0 +++ b/metadata/md5-cache/dev-libs/atcore-1.0.0 @@ -10,5 +10,9 @@ LICENSE=|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ ) RDEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f9893731f9b92e323ec9c8b42b9ce97c diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.11 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.11 index e230945c8822..ed6b5aa1e099 100644 --- a/metadata/md5-cache/dev-libs/aws-c-common-0.4.11 +++ b/metadata/md5-cache/dev-libs/aws-c-common-0.4.11 @@ -8,5 +8,9 @@ KEYWORDS=~amd64 ~x86 LICENSE=Apache-2.0 SLOT=0 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.11.tar.gz -> aws-c-common-0.4.11.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=906ec321e54db63114f2386b14237cba diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 index c59df0e40695..91bd9b34949e 100644 --- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 +++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 @@ -1,6 +1,10 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 DEFINED_PHASES=compile configure install prepare test +<<<<<<< HEAD +DEPEND=dev-libs/aws-c-common +======= DEPEND=dev-libs/aws-c-common dev-libs/aws-checksums +>>>>>>> next DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type EAPI=7 HOMEPAGE=https://github.com/awslabs/aws-c-event-stream @@ -9,5 +13,10 @@ KEYWORDS=~amd64 ~x86 LICENSE=Apache-2.0 SLOT=0 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.1.3.tar.gz -> aws-c-event-stream-0.1.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=5ac1b5042797c7d213b0c426153c1c54 +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=a3391b493790e101cbfb87187a089ea1 +>>>>>>> next diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.3 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.3 index 42172f49e925..b5bf6599bf17 100644 --- a/metadata/md5-cache/dev-libs/aws-checksums-0.1.3 +++ b/metadata/md5-cache/dev-libs/aws-checksums-0.1.3 @@ -8,5 +8,9 @@ KEYWORDS=~amd64 ~x86 LICENSE=Apache-2.0 SLOT=0 SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.3.tar.gz -> aws-checksums-0.1.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d25b8d0c12fd80a38d0b0da44acd7038 diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 index 3cd03ebd27f7..21da079ad2b6 100644 --- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 +++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 @@ -11,5 +11,9 @@ RDEPEND=http? ( net-misc/curl:= ) polly? ( media-sound/pulseaudio ) ssl? ( !libr REQUIRED_USE=python_targets_python2_7 SLOT=0 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.7.178.tar.gz -> aws-sdk-cpp-1.7.178.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2319f580c7d49061078711209160b58b diff --git a/metadata/md5-cache/dev-libs/efl-1.22.5 b/metadata/md5-cache/dev-libs/efl-1.22.5 index 1cdc5aa0dfab..246718ca8ece 100644 --- a/metadata/md5-cache/dev-libs/efl-1.22.5 +++ b/metadata/md5-cache/dev-libs/efl-1.22.5 @@ -1,15 +1,15 @@ BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) DEFINED_PHASES=compile configure install postinst postrm prepare -DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) wayland? ( x11-libs/libxkbcommon[X] ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) +DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) DESCRIPTION=Enlightenment Foundation Libraries all-in-one package EAPI=7 HOMEPAGE=https://www.enlightenment.org IUSE=+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB -RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) wayland? ( x11-libs/libxkbcommon[X] ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) +RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X ) SLOT=0 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.22.5.tar.xz _eclasses_=pax-utils db85a3c508cf82c45f24b2723791cc93 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=3584e56d0a966cfcbe13b863863407af +_md5_=e4dffcd4ee05960a0c7641b8ae1f43e6 diff --git a/metadata/md5-cache/dev-libs/ell-0.23 b/metadata/md5-cache/dev-libs/ell-0.23 index 92c2a43ea647..49fccc78ec6e 100644 --- a/metadata/md5-cache/dev-libs/ell-0.23 +++ b/metadata/md5-cache/dev-libs/ell-0.23 @@ -9,5 +9,9 @@ LICENSE=LGPL-2.1 RDEPEND=glib? ( dev-libs/glib:2[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(-)?] ) SLOT=0 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.23.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=abccb2a5a62c4f4a00f2fa35575488a9 diff --git a/metadata/md5-cache/dev-libs/expat-2.2.8 b/metadata/md5-cache/dev-libs/expat-2.2.8 index 55ac10f5bace..753ad01ef1e5 100644 --- a/metadata/md5-cache/dev-libs/expat-2.2.8 +++ b/metadata/md5-cache/dev-libs/expat-2.2.8 @@ -4,9 +4,17 @@ DESCRIPTION=Stream-oriented XML parser library EAPI=7 HOMEPAGE=https://libexpat.github.io/ IUSE=elibc_FreeBSD examples static-libs unicode 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 split-usr +<<<<<<< HEAD +KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +======= KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +>>>>>>> next LICENSE=MIT SLOT=0 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_8/expat-2.2.8.tar.xz _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +<<<<<<< HEAD +_md5_=22d08b5c8a6df81e440b543975adc75e +======= _md5_=ac2cd4ef8e08bc653b3c41e0f92259e1 +>>>>>>> next diff --git a/metadata/md5-cache/dev-libs/glib-2.60.6 b/metadata/md5-cache/dev-libs/glib-2.60.6 index 96c5ba95dacd..51a8486129ea 100644 --- a/metadata/md5-cache/dev-libs/glib-2.60.6 +++ b/metadata/md5-cache/dev-libs/glib-2.60.6 @@ -11,5 +11,9 @@ PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info ) RDEPEND=!<dev-util/gdbus-codegen-2.60.6 >=virtual/libiconv-0-r1[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(-)?] >=dev-libs/libpcre-8.31:3[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(-)?,static-libs?] >=virtual/libffi-3.0.13-r1:=[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(-)?] >=sys-libs/zlib-1.2.8-r1[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(-)?] >=virtual/libintl-0-r2[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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[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(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[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(-)?] ) ) virtual/libelf:0= fam? ( >=virtual/fam-0-r1[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(-)?] ) SLOT=2 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 532371cfcba45b2ab0d2950547c97d95 linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 532371cfcba45b2ab0d2950547c97d95 linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f7e694e203afafcc5bf7e9c3ad87af18 diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.2-r1 b/metadata/md5-cache/dev-libs/gmp-6.1.2-r1 index c1e205688293..45aafa13b7de 100644 --- a/metadata/md5-cache/dev-libs/gmp-6.1.2-r1 +++ b/metadata/md5-cache/dev-libs/gmp-6.1.2-r1 @@ -8,5 +8,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh s LICENSE=|| ( LGPL-3+ GPL-2+ ) SLOT=0/10.4 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.2/gmp-6.1.2.tar.xz mirror://gnu/gmp/gmp-6.1.2.tar.xz doc? ( https://gmplib.org/gmp-man-6.1.2.pdf ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=044b802f42a2cd458589fe63813cbbbd diff --git a/metadata/md5-cache/dev-libs/intel-neo-19.30.13641 b/metadata/md5-cache/dev-libs/intel-neo-19.30.13641 index cf613e72bf63..e8c5d07f79d6 100644 --- a/metadata/md5-cache/dev-libs/intel-neo-19.30.13641 +++ b/metadata/md5-cache/dev-libs/intel-neo-19.30.13641 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=dev-libs/ocl-icd dev-util/intel-graphics-compiler >=media-libs/gmmlib-19.2.3 vaapi? ( x11-libs/libdrm[video_cards_intel] >=x11-libs/libva-2.0.0 ) SLOT=0 SRC_URI=https://github.com/intel/compute-runtime/archive/19.30.13641.tar.gz -> intel-neo-19.30.13641.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4c102b5632a877854745c336fbb3ece9 diff --git a/metadata/md5-cache/dev-libs/jemalloc-3.6.0 b/metadata/md5-cache/dev-libs/jemalloc-3.6.0 index 61633d2f70d6..a7a764583a4e 100644 --- a/metadata/md5-cache/dev-libs/jemalloc-3.6.0 +++ b/metadata/md5-cache/dev-libs/jemalloc-3.6.0 @@ -8,5 +8,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~a LICENSE=BSD SLOT=0 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=3ee75c66a2a6357c567066680aa3f8ce diff --git a/metadata/md5-cache/dev-libs/kasync-0.2.0 b/metadata/md5-cache/dev-libs/kasync-0.2.0 index 23720611ca3e..6f24db414d6c 100644 --- a/metadata/md5-cache/dev-libs/kasync-0.2.0 +++ b/metadata/md5-cache/dev-libs/kasync-0.2.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/kasync/0.2.0/src/kasync-0.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ecee1f70c1d7f49e4cbe498a13254db3 diff --git a/metadata/md5-cache/dev-libs/kasync-0.3.0 b/metadata/md5-cache/dev-libs/kasync-0.3.0 index f068f662dfcd..c5e77ffd5045 100644 --- a/metadata/md5-cache/dev-libs/kasync-0.3.0 +++ b/metadata/md5-cache/dev-libs/kasync-0.3.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/kasync/0.3.0/src/kasync-0.3.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ecee1f70c1d7f49e4cbe498a13254db3 diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1 b/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1 index 2581bc997064..0941be43614c 100644 --- a/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1 +++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.1-r1 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg- REQUIRED_USE=test? ( examples ) SLOT=5 SRC_URI=mirror://kde/stable/kdiagram/2.6.1/kdiagram-2.6.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c9dd87277606f05e73eb3b3ee44442de diff --git a/metadata/md5-cache/dev-libs/kproperty-3.2.0 b/metadata/md5-cache/dev-libs/kproperty-3.2.0 index e8e99c5a504a..f6dbbd90df5b 100644 --- a/metadata/md5-cache/dev-libs/kproperty-3.2.0 +++ b/metadata/md5-cache/dev-libs/kproperty-3.2.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5/4 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9e0c0175f20df26779f1ac223f89235f diff --git a/metadata/md5-cache/dev-libs/kreport-3.2.0 b/metadata/md5-cache/dev-libs/kreport-3.2.0 index 78907cce8de7..cb4584a4d41a 100644 --- a/metadata/md5-cache/dev-libs/kreport-3.2.0 +++ b/metadata/md5-cache/dev-libs/kreport-3.2.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-libs/kproperty-3.1.0:5= marble? ( >=kde-apps/marble-19.04.3:5= ) scripting? ( >=dev-qt/qtdeclarative-5.12.3:5 ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/4 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=af064614baf7172c656935668c9d15bd diff --git a/metadata/md5-cache/dev-libs/leatherman-1.7.1 b/metadata/md5-cache/dev-libs/leatherman-1.7.1 index fabe36803ef8..311e553cae27 100644 --- a/metadata/md5-cache/dev-libs/leatherman-1.7.1 +++ b/metadata/md5-cache/dev-libs/leatherman-1.7.1 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0 RDEPEND=net-misc/curl SLOT=0/1.7.1 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.7.1.tar.gz -> leatherman-1.7.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3084cc0627123365db2c883337ddec3a diff --git a/metadata/md5-cache/dev-libs/leatherman-1.7.2 b/metadata/md5-cache/dev-libs/leatherman-1.7.2 index 872276a8bbc4..797c051c7f42 100644 --- a/metadata/md5-cache/dev-libs/leatherman-1.7.2 +++ b/metadata/md5-cache/dev-libs/leatherman-1.7.2 @@ -9,5 +9,5 @@ LICENSE=Apache-2.0 RDEPEND=net-misc/curl SLOT=0/1.7.2 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.7.2.tar.gz -> leatherman-1.7.2.tar.gz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=5a2c05a04c8a4f1251b8cf5358ed625b diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 index 0c8f9325d3db..65e04f67789d 100644 --- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 +++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 @@ -12,5 +12,9 @@ REQUIRED_USE=daemon? ( tools ) RESTRICT=test SLOT=0 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=f57a07e5ef907b4ced4bf2aa7ea4d26c diff --git a/metadata/md5-cache/dev-libs/libexecinfo-1.1 b/metadata/md5-cache/dev-libs/libexecinfo-1.1 index 0f1cbcd183e2..634953b1fe11 100644 --- a/metadata/md5-cache/dev-libs/libexecinfo-1.1 +++ b/metadata/md5-cache/dev-libs/libexecinfo-1.1 @@ -8,5 +8,9 @@ KEYWORDS=~amd64-fbsd ~x86-fbsd LICENSE=BSD-2 SLOT=0 SRC_URI=mirror://gentoo/libexecinfo-1.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=4315ac36193be357b58ce046556dc9c7 diff --git a/metadata/md5-cache/dev-libs/libffi-3.3_rc0 b/metadata/md5-cache/dev-libs/libffi-3.3_rc0 index 24f9ee75801b..f05aef24abae 100644 --- a/metadata/md5-cache/dev-libs/libffi-3.3_rc0 +++ b/metadata/md5-cache/dev-libs/libffi-3.3_rc0 @@ -4,9 +4,17 @@ DESCRIPTION=a portable, high level programming interface to various calling conv EAPI=7 HOMEPAGE=https://sourceware.org/libffi/ IUSE=debug pax_kernel static-libs test 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 ~x64-cygwin ~amd64-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +>>>>>>> next LICENSE=MIT SLOT=0/7 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz _eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +<<<<<<< HEAD +_md5_=8aa0300dfaf44fb1c2f0d6be8535f54f +======= _md5_=69fb9901b8e1a0e62131a98af2101c8a +>>>>>>> next diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.18.2 b/metadata/md5-cache/dev-libs/libfilezilla-0.18.2 index 7b55922e9948..fb98fcef7433 100644 --- a/metadata/md5-cache/dev-libs/libfilezilla-0.18.2 +++ b/metadata/md5-cache/dev-libs/libfilezilla-0.18.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2+ RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= SLOT=0 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.18.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=0eab4226e3758676fffc3431f7c173dd diff --git a/metadata/md5-cache/dev-libs/libical-3.0.6 b/metadata/md5-cache/dev-libs/libical-3.0.6 index da23ea8bf12e..eb860dd6e166 100644 --- a/metadata/md5-cache/dev-libs/libical-3.0.6 +++ b/metadata/md5-cache/dev-libs/libical-3.0.6 @@ -11,5 +11,9 @@ RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) introspection? ( dev-libs/glib: REQUIRED_USE=vala? ( introspection ) SLOT=0/3 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.6/libical-3.0.6.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vala 682da46cf615b9f7a7d3680058139dcd xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vala 682da46cf615b9f7a7d3680058139dcd xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c70b9f382a0aa59764ca5975ce964689 diff --git a/metadata/md5-cache/dev-libs/liboil-0.3.17-r2 b/metadata/md5-cache/dev-libs/liboil-0.3.17-r2 index 08830065db20..b9fef4a377b0 100644 --- a/metadata/md5-cache/dev-libs/liboil-0.3.17-r2 +++ b/metadata/md5-cache/dev-libs/liboil-0.3.17-r2 @@ -9,5 +9,9 @@ LICENSE=BSD-2 RDEPEND=examples? ( dev-libs/glib:2 ) SLOT=0.3 SRC_URI=https://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=17c540a0e0c523b145a6aa5a93c0e1d6 diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.1 b/metadata/md5-cache/dev-libs/libpwquality-1.4.1 index a97fdb8913c1..c0b1f08586c0 100644 --- a/metadata/md5-cache/dev-libs/libpwquality-1.4.1 +++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.1 @@ -10,5 +10,9 @@ RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( virtual/pam ) python? REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) SLOT=0 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.1/libpwquality-1.4.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=123dc9ba3241edae24c002166b14fdd7 diff --git a/metadata/md5-cache/dev-libs/libvterm-0.1 b/metadata/md5-cache/dev-libs/libvterm-0.1 new file mode 100644 index 000000000000..a9e6711370de --- /dev/null +++ b/metadata/md5-cache/dev-libs/libvterm-0.1 @@ -0,0 +1,12 @@ +BDEPEND=dev-lang/perl sys-devel/libtool virtual/pkgconfig +DEFINED_PHASES=compile install prepare +DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator +EAPI=7 +HOMEPAGE=http://www.leonerd.org.uk/code/libvterm/ +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=MIT +RDEPEND=!dev-libs/libvterm-neovim +SLOT=0 +SRC_URI=https://launchpad.net/libvterm/trunk/v0.1/+download/libvterm-0.1.tar.gz +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=61eb26056d51dd8a01d98ab8e5ec8362 diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.2 b/metadata/md5-cache/dev-libs/libwbxml-0.11.2 index c09895924ed4..d3ed14dcde1f 100644 --- a/metadata/md5-cache/dev-libs/libwbxml-0.11.2 +++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/expat virtual/libiconv SLOT=0 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=82efac847f966a541d48f61b690405fc diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.6 b/metadata/md5-cache/dev-libs/libwbxml-0.11.6 index 4338e6e5cdf3..b51a5d859f04 100644 --- a/metadata/md5-cache/dev-libs/libwbxml-0.11.6 +++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.6 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/expat virtual/libiconv SLOT=0 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=57b98ec3dccd9bde5bb14005231c700e diff --git a/metadata/md5-cache/dev-libs/nspr-4.22 b/metadata/md5-cache/dev-libs/nspr-4.22 index 5086e46be314..b982df99ad98 100644 --- a/metadata/md5-cache/dev-libs/nspr-4.22 +++ b/metadata/md5-cache/dev-libs/nspr-4.22 @@ -4,9 +4,17 @@ 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 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 diff --git a/metadata/md5-cache/dev-libs/nss-3.46 b/metadata/md5-cache/dev-libs/nss-3.46 index f183fe5de0bd..eb1edb4c0eaa 100644 --- a/metadata/md5-cache/dev-libs/nss-3.46 +++ b/metadata/md5-cache/dev-libs/nss-3.46 @@ -4,11 +4,20 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp EAPI=7 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ IUSE=cacert +nss-pem utils 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 ~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 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) RDEPEND=>=dev-libs/nspr-4.22[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(-)?] >=dev-db/sqlite-3.8.2[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(-)?] >=sys-libs/zlib-1.2.8-r1[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(-)?] RESTRICT=test SLOT=0 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_46_RTM/src/nss-3.46.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=b3b6307e3557ab5abc11232f9f9635c9 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=e7312c1f75621610b44ab0aab533ddbb +>>>>>>> next diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2s-r2 b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r2 index 2eac3b77f79b..211d80e16afa 100644 --- a/metadata/md5-cache/dev-libs/openssl-1.0.2s-r2 +++ b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r2 @@ -12,5 +12,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+) RESTRICT=!bindist? ( bindist ) SLOT=0 SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c ) -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=5e0a711fae5299b150251d1c911a1726 diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2t-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2t-r1 index 4c703eaff6cd..9ec5c55514e7 100644 --- a/metadata/md5-cache/dev-libs/openssl-1.0.2t-r1 +++ b/metadata/md5-cache/dev-libs/openssl-1.0.2t-r1 @@ -12,5 +12,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+) RESTRICT=!bindist? ( bindist ) SLOT=0 SRC_URI=mirror://openssl/source/openssl-1.0.2t.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=9d2c9a0cc9a211d411ebeca498716d20 diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s-r1 b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s-r1 index 10f0c4e96553..8ffd613855bc 100644 --- a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s-r1 +++ b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s-r1 @@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64 RESTRICT=test SLOT=1.0.0 SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c ) -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=747c0f53abcf672f9866ae281b5b95f0 diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t-r1 b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t-r1 index b06fd23b37de..4499ec032221 100644 --- a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t-r1 +++ b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t-r1 @@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64 RESTRICT=test SLOT=1.0.0 SRC_URI=mirror://openssl/source/openssl-1.0.2t.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=22c2654c406d425bc0623e2ba850b6f0 diff --git a/metadata/md5-cache/dev-libs/rlottie-0.0.1_pre20190920 b/metadata/md5-cache/dev-libs/rlottie-0.0.1_pre20190920 index b6b8e259deb8..55aee5ca0549 100644 --- a/metadata/md5-cache/dev-libs/rlottie-0.0.1_pre20190920 +++ b/metadata/md5-cache/dev-libs/rlottie-0.0.1_pre20190920 @@ -5,10 +5,18 @@ DESCRIPTION=A platform independent standalone library that plays Lottie Animatio EAPI=7 HOMEPAGE=https://www.tizen.org/ https://github.com/Samsung/rlottie IUSE=test +<<<<<<< HEAD +KEYWORDS=~amd64 ~x86 +======= KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 +>>>>>>> next LICENSE=BSD FTL LGPL-2.1 MIT RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/Samsung/rlottie/archive/93dd5305d9f5d2270a873c9c565b6931439fd11f.tar.gz -> rlottie-0.0.1_pre20190920.tar.gz _eclasses_=meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +<<<<<<< HEAD +_md5_=260c654301fb19cb77ecd9032e2fa97e +======= _md5_=79d77a0a580472e478ed110a18be41e8 +>>>>>>> next diff --git a/metadata/md5-cache/dev-libs/sink-0.7.0 b/metadata/md5-cache/dev-libs/sink-0.7.0 index d1632529b2e8..3e4447eacb02 100644 --- a/metadata/md5-cache/dev-libs/sink-0.7.0 +++ b/metadata/md5-cache/dev-libs/sink-0.7.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-apps/kcalcore-19.04.3:5 >=kd RESTRICT=test SLOT=5 SRC_URI=https://github.com/KDE/sink/archive/v0.7.0.tar.gz -> sink-0.7.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2b2b78579fd77822c15307f0918921a9 diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz Binary files differindex cde5e0b8367b..91dbf2788977 100644 --- a/metadata/md5-cache/dev-lisp/Manifest.gz +++ b/metadata/md5-cache/dev-lisp/Manifest.gz diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.5.6 b/metadata/md5-cache/dev-lisp/sbcl-1.5.6 index 797973b7166d..69ff52ee23bc 100644 --- a/metadata/md5-cache/dev-lisp/sbcl-1.5.6 +++ b/metadata/md5-cache/dev-lisp/sbcl-1.5.6 @@ -9,5 +9,5 @@ LICENSE=MIT RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) ) SLOT=0/1.5.6 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.5.6-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.5.6-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=7825f46ca40f125fa0005f704d323ca8 diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz Binary files differindex beba402d04aa..248034312958 100644 --- a/metadata/md5-cache/dev-lua/Manifest.gz +++ b/metadata/md5-cache/dev-lua/Manifest.gz diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.0-r1 b/metadata/md5-cache/dev-lua/lgi-0.9.0-r1 index 85f38dd146dd..1e975826f2b3 100644 --- a/metadata/md5-cache/dev-lua/lgi-0.9.0-r1 +++ b/metadata/md5-cache/dev-lua/lgi-0.9.0-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi:0= SLOT=0 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.0.tar.gz -> lgi-0.9.0.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 +>>>>>>> next _md5_=2d28f0fa41f4de0b0337dae36f9634f3 diff --git a/metadata/md5-cache/dev-lua/luv-1.30.1.1 b/metadata/md5-cache/dev-lua/luv-1.30.1.1 index 338e310e10da..e87e61d5a8f7 100644 --- a/metadata/md5-cache/dev-lua/luv-1.30.1.1 +++ b/metadata/md5-cache/dev-lua/luv-1.30.1.1 @@ -11,5 +11,5 @@ RDEPEND=dev-libs/libuv:= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/luvit/luv/archive/1.30.1-1.tar.gz -> luv-1.30.1.1.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz -> luv-lua-compat-0.7.tar.gz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=0cc6b46997e3cf843f1f2155bec6c18a diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz Binary files differindex 9038713b615d..a378b72107d5 100644 --- a/metadata/md5-cache/dev-ml/Manifest.gz +++ b/metadata/md5-cache/dev-ml/Manifest.gz diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999 index e7968a292fde..05228b5f6be7 100644 --- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999 +++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0. REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 ) RESTRICT=!test? ( test ) SLOT=0/10.0.0.9999 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1e4409874033eb24c635585c71bd64e5 diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0 index bdda61823305..6f854d55f6cb 100644 --- a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0 +++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0 @@ -12,5 +12,9 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm RESTRICT=!test? ( test ) SLOT=0/9.0.0 SRC_URI=https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dcd3d72d85b8d0ba639c1fa4e26d7a57 diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0.9999 index ff1132d4313f..902bfa919a1e 100644 --- a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0.9999 +++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.0.9 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) RESTRICT=!test? ( test ) SLOT=0/9.0.0.9999 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=656d4321473ccbd8e69339c4bb64e36b diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz Binary files differindex c516df699e64..486e88d532f3 100644 --- a/metadata/md5-cache/dev-perl/Manifest.gz +++ b/metadata/md5-cache/dev-perl/Manifest.gz diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz Binary files differindex 7009eaf4fae0..ce1e03565a2a 100644 --- a/metadata/md5-cache/dev-php/Manifest.gz +++ b/metadata/md5-cache/dev-php/Manifest.gz diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r2 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r2 index 57fac4e13c8f..79814c56a344 100644 --- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r2 +++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r2 @@ -11,5 +11,9 @@ REQUIRED_USE=|| ( php_targets_php5-6 ) RESTRICT=test SLOT=0 SRC_URI=https://pecl.php.net/get/memcache-3.0.8.tgz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=912f0756a251274db1f656847ab1f716 diff --git a/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.2.0-r2 b/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.2.0-r2 index a460682ba3e5..ebb3a4d5e83f 100644 --- a/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.2.0-r2 +++ b/metadata/md5-cache/dev-php/pecl-mysqlnd_qc-1.2.0-r2 @@ -10,5 +10,9 @@ RDEPEND=memcached? ( dev-libs/libmemcached ) sqlite? ( dev-db/sqlite:3 ) php_tar REQUIRED_USE=|| ( php_targets_php5-6 ) SLOT=0 SRC_URI=https://pecl.php.net/get/mysqlnd_qc-1.2.0.tgz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=15cfe2609b615e0d1426c6db32f800fd diff --git a/metadata/md5-cache/dev-php/pecl-pam-1.0.3-r3 b/metadata/md5-cache/dev-php/pecl-pam-1.0.3-r3 index 337868815a0b..b68a58c74930 100644 --- a/metadata/md5-cache/dev-php/pecl-pam-1.0.3-r3 +++ b/metadata/md5-cache/dev-php/pecl-pam-1.0.3-r3 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/pam php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) SLOT=0 SRC_URI=https://pecl.php.net/get/pam-1.0.3.tgz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=0a471909bba0cd227bed0a739d5c1235 diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz Binary files differindex 9253ce95c771..53f059db4bc9 100644 --- a/metadata/md5-cache/dev-python/Manifest.gz +++ b/metadata/md5-cache/dev-python/Manifest.gz diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.1 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.1 new file mode 100644 index 000000000000..7d7583c53e8f --- /dev/null +++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install +DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyQt5-sip-4.19.14:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] >=dev-python/sip-4.19.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] +DESCRIPTION=Python bindings for QtWebEngine +EAPI=7 +HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro +IUSE=debug python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +KEYWORDS=~amd64 ~arm ~arm64 ~x86 +LICENSE=GPL-3 +RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyQt5-sip-4.19.14:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] +REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) +SLOT=0 +SRC_URI=https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/5.13.1/PyQtWebEngine_gpl-5.13.1.tar.gz +_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=58dac1085e797ae980f4640e619d2efb diff --git a/metadata/md5-cache/dev-python/m2r-0.1.6 b/metadata/md5-cache/dev-python/m2r-0.1.6 index c2deba17c482..d5775ce69cfe 100644 --- a/metadata/md5-cache/dev-python/m2r-0.1.6 +++ b/metadata/md5-cache/dev-python/m2r-0.1.6 @@ -1,5 +1,9 @@ DEFINED_PHASES=compile configure install prepare test +<<<<<<< HEAD +DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] +======= DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] +>>>>>>> next DESCRIPTION=Markdown to reStructuredText converter EAPI=6 HOMEPAGE=https://github.com/miyakogi/m2r https://pypi.org/project/m2r/ @@ -11,4 +15,8 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py SLOT=0 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.6.tar.gz _eclasses_=distutils-r1 9838160d624a44b2d56d1266a69fd473 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +<<<<<<< HEAD +_md5_=41154f17d483137fcb616a3b0497106c +======= _md5_=ae077c7830e0dc093eb17294cde7ff18 +>>>>>>> next diff --git a/metadata/md5-cache/dev-python/twisted-16.6.0-r3 b/metadata/md5-cache/dev-python/twisted-16.6.0-r3 index d34c637e66e4..dfde0fc0c842 100644 --- a/metadata/md5-cache/dev-python/twisted-16.6.0-r3 +++ b/metadata/md5-cache/dev-python/twisted-16.6.0-r3 @@ -10,5 +10,9 @@ RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_tar REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) SLOT=0 SRC_URI=https://twistedmatrix.com/Releases/Twisted/16.6/Twisted-16.6.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c2f16a26457e259bedb1c4ba9d495a95 diff --git a/metadata/md5-cache/dev-python/twisted-17.1.0-r2 b/metadata/md5-cache/dev-python/twisted-17.1.0-r2 index 4cd83985a07a..a42a11e29aad 100644 --- a/metadata/md5-cache/dev-python/twisted-17.1.0-r2 +++ b/metadata/md5-cache/dev-python/twisted-17.1.0-r2 @@ -10,5 +10,9 @@ RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_tar REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) SLOT=0 SRC_URI=https://twistedmatrix.com/Releases/Twisted/17.1/Twisted-17.1.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=55aaf75e9c47b213de6e0a9888062043 diff --git a/metadata/md5-cache/dev-python/twisted-17.9.0 b/metadata/md5-cache/dev-python/twisted-17.9.0 index e12ae0572d9a..89c69d871bd4 100644 --- a/metadata/md5-cache/dev-python/twisted-17.9.0 +++ b/metadata/md5-cache/dev-python/twisted-17.9.0 @@ -10,5 +10,9 @@ RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_tar REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) SLOT=0 SRC_URI=https://twistedmatrix.com/Releases/Twisted/17.9/Twisted-17.9.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d697ef57d8edaa0ff410dd9c07b2aff1 diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz Binary files differindex 99c08e40ea97..c6e8ac043f87 100644 --- a/metadata/md5-cache/dev-qt/Manifest.gz +++ b/metadata/md5-cache/dev-qt/Manifest.gz diff --git a/metadata/md5-cache/dev-qt/qtgui-5.12.5 b/metadata/md5-cache/dev-qt/qtgui-5.12.5 index 583d6c5b4512..bf42bd1e016b 100644 --- a/metadata/md5-cache/dev-qt/qtgui-5.12.5 +++ b/metadata/md5-cache/dev-qt/qtgui-5.12.5 @@ -13,5 +13,9 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( RESTRICT=test SLOT=5/5.12 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz +<<<<<<< HEAD +_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e qt5-build 32c6b92cbc940aea3252cc6d7ee6adde toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 +======= _eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e qt5-build 32c6b92cbc940aea3252cc6d7ee6adde toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 +>>>>>>> next _md5_=8dd508124c5c60dc22d7bbf937108627 diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz Binary files differindex 53e6718cd49d..00c03b69123b 100644 --- a/metadata/md5-cache/dev-ruby/Manifest.gz +++ b/metadata/md5-cache/dev-ruby/Manifest.gz diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.17 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.17 new file mode 100644 index 000000000000..5f71418f5416 --- /dev/null +++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.17 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/activerecord[ruby_targets_ruby25,sqlite] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ) +DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list +EAPI=6 +HOMEPAGE=https://github.com/swanandp/acts_as_list +IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 doc test test +KEYWORDS=~amd64 ~x86-macos +LICENSE=MIT +RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) +REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ) +SLOT=3 +SRC_URI=mirror://rubygems/acts_as_list-0.9.17.gem +_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem c8dcac8f7763e5eae502d4a905ce77e9 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=cb9b06e9f0295765c68f496f82c397c9 diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.9.18 b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.18 new file mode 100644 index 000000000000..467bd48fe243 --- /dev/null +++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.9.18 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/activerecord[ruby_targets_ruby24,sqlite] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/activerecord[ruby_targets_ruby25,sqlite] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ) +DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list +EAPI=6 +HOMEPAGE=https://github.com/swanandp/acts_as_list +IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 doc test test +KEYWORDS=~amd64 ~x86-macos +LICENSE=MIT +RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) +REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ) +SLOT=3 +SRC_URI=mirror://rubygems/acts_as_list-0.9.18.gem +_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem c8dcac8f7763e5eae502d4a905ce77e9 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=f4ff51fa0f5fca4be070771b6e1e46cb diff --git a/metadata/md5-cache/dev-ruby/erubi-1.8.0 b/metadata/md5-cache/dev-ruby/erubi-1.8.0 index 3d712cb7196c..3a1646dc14a8 100644 --- a/metadata/md5-cache/dev-ruby/erubi-1.8.0 +++ b/metadata/md5-cache/dev-ruby/erubi-1.8.0 @@ -11,4 +11,8 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) SLOT=0 SRC_URI=mirror://rubygems/erubi-1.8.0.gem _eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem c8dcac8f7763e5eae502d4a905ce77e9 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +<<<<<<< HEAD +_md5_=c0995a53fc5c6580d69e5f82c68965a3 +======= _md5_=88089ac73d42cbb3b8ecf0cb01e0064b +>>>>>>> next diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.3 b/metadata/md5-cache/dev-ruby/facter-3.14.3 index e866439e7c77..d417b12a1acc 100644 --- a/metadata/md5-cache/dev-ruby/facter-3.14.3 +++ b/metadata/md5-cache/dev-ruby/facter-3.14.3 @@ -10,5 +10,9 @@ RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux ap REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) SLOT=0 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.3.tar.gz -> facter-3.14.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=07f380cbb0aeb1d4bcafa536e61c92d8 diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.4 b/metadata/md5-cache/dev-ruby/facter-3.14.4 index c82e98ddf2c1..0d512b7495fb 100644 --- a/metadata/md5-cache/dev-ruby/facter-3.14.4 +++ b/metadata/md5-cache/dev-ruby/facter-3.14.4 @@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux ap REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) SLOT=0 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.4.tar.gz -> facter-3.14.4.tar.gz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=44faca1e94110b4594d6ad2f2a73422e diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.18 b/metadata/md5-cache/dev-ruby/gpgme-2.0.18 index 7ddfb1093300..d72e6b672fe5 100644 --- a/metadata/md5-cache/dev-ruby/gpgme-2.0.18 +++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.18 @@ -10,5 +10,9 @@ RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) SLOT=0 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.18.tar.gz -> ruby-gpgme-2.0.18.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem c8dcac8f7763e5eae502d4a905ce77e9 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem c8dcac8f7763e5eae502d4a905ce77e9 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f343291f0bd9ddafae7fd417988d58b7 diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz Binary files differindex bc1f30f455c5..397c25b0a6ea 100644 --- a/metadata/md5-cache/dev-scheme/Manifest.gz +++ b/metadata/md5-cache/dev-scheme/Manifest.gz diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz Binary files differindex 82f647b426e3..f4bda4f27e66 100644 --- a/metadata/md5-cache/dev-tcltk/Manifest.gz +++ b/metadata/md5-cache/dev-tcltk/Manifest.gz diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4 b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4 index 6cce79ec50e4..04ab6b78ac3b 100644 --- a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4 +++ b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4 @@ -9,5 +9,9 @@ LICENSE=MPL-1.1 RDEPEND=dev-lang/tcl:0= dev-libs/expat SLOT=0 SRC_URI=https://github.com/downloads/tDOM/tdom/tDOM-0.8.3.tgz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=91406e4bfd003a76c719a7538b5ede8b diff --git a/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2 b/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2 new file mode 100644 index 000000000000..b76b78e2cf88 --- /dev/null +++ b/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-lang/tk x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=app-portage/elt-patches-20170815 +DESCRIPTION=Tcl/Tk Theming library +EAPI=4 +HOMEPAGE=http://www.xmission.com/~georgeps/Tk_Theme/other/ +IUSE=debug examples static-libs threads +KEYWORDS=alpha amd64 ppc x86 +LICENSE=BSD +RDEPEND=dev-lang/tk x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm +SLOT=0 +SRC_URI=mirror://gentoo/tkTheme.tgz -> tkTheme-1.0.tgz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=cfdfb9d0eedaac8b8b0081fa15bfa51d diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz Binary files differindex 79d5cfc48218..274f45cab7eb 100644 --- a/metadata/md5-cache/dev-tex/Manifest.gz +++ b/metadata/md5-cache/dev-tex/Manifest.gz diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8 index 3e15447e00f0..d3828090d823 100644 --- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8 +++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8 @@ -10,5 +10,9 @@ LICENSE=LPPL-1.2 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 ) SLOT=0 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz mirror://gentoo/tex4ht-texlive-2019-03-22.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 latex-package 17f13abe0de88340745e52e6b627aee7 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 latex-package 17f13abe0de88340745e52e6b627aee7 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=8133365bcf510dd8dd6ad007f31f0441 diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz Binary files differindex 9e5964f8beef..bfdf3d95a1f2 100644 --- a/metadata/md5-cache/dev-texlive/Manifest.gz +++ b/metadata/md5-cache/dev-texlive/Manifest.gz diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2019 b/metadata/md5-cache/dev-texlive/texlive-pictures-2019 index eb82ca95c1be..14d850d443be 100644 --- a/metadata/md5-cache/dev-texlive/texlive-pictures-2019 +++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2019 @@ -11,4 +11,8 @@ RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-tex/pgf-3.0.1 !=dev-texlive/texli SLOT=0 SRC_URI=mirror://gentoo/texlive-module-adigraph-2019.tar.xz mirror://gentoo/texlive-module-aobs-tikz-2019.tar.xz mirror://gentoo/texlive-module-askmaps-2019.tar.xz mirror://gentoo/texlive-module-asyfig-2019.tar.xz mirror://gentoo/texlive-module-asypictureb-2019.tar.xz mirror://gentoo/texlive-module-autoarea-2019.tar.xz mirror://gentoo/texlive-module-bardiag-2019.tar.xz mirror://gentoo/texlive-module-beamerswitch-2019.tar.xz mirror://gentoo/texlive-module-binarytree-2019.tar.xz mirror://gentoo/texlive-module-blochsphere-2019.tar.xz mirror://gentoo/texlive-module-bloques-2019.tar.xz mirror://gentoo/texlive-module-blox-2019.tar.xz mirror://gentoo/texlive-module-bodegraph-2019.tar.xz mirror://gentoo/texlive-module-bondgraph-2019.tar.xz mirror://gentoo/texlive-module-bondgraphs-2019.tar.xz mirror://gentoo/texlive-module-braids-2019.tar.xz mirror://gentoo/texlive-module-bxeepic-2019.tar.xz mirror://gentoo/texlive-module-cachepic-2019.tar.xz mirror://gentoo/texlive-module-callouts-2019.tar.xz mirror://gentoo/texlive-module-celtic-2019.tar.xz mirror://gentoo/texlive-module-chemfig-2019.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2019.tar.xz mirror://gentoo/texlive-module-circuitikz-2019.tar.xz mirror://gentoo/texlive-module-curve-2019.tar.xz mirror://gentoo/texlive-module-curve2e-2019.tar.xz mirror://gentoo/texlive-module-curves-2019.tar.xz mirror://gentoo/texlive-module-dcpic-2019.tar.xz mirror://gentoo/texlive-module-diagmac2-2019.tar.xz mirror://gentoo/texlive-module-ditaa-2019.tar.xz mirror://gentoo/texlive-module-doc-pictex-2019.tar.xz mirror://gentoo/texlive-module-dottex-2019.tar.xz mirror://gentoo/texlive-module-dratex-2019.tar.xz mirror://gentoo/texlive-module-drs-2019.tar.xz mirror://gentoo/texlive-module-duotenzor-2019.tar.xz mirror://gentoo/texlive-module-dynkin-diagrams-2019.tar.xz mirror://gentoo/texlive-module-ecgdraw-2019.tar.xz mirror://gentoo/texlive-module-eepic-2019.tar.xz mirror://gentoo/texlive-module-ellipse-2019.tar.xz mirror://gentoo/texlive-module-endofproofwd-2019.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2019.tar.xz mirror://gentoo/texlive-module-esk-2019.tar.xz mirror://gentoo/texlive-module-euflag-2019.tar.xz mirror://gentoo/texlive-module-fast-diagram-2019.tar.xz mirror://gentoo/texlive-module-fig4latex-2019.tar.xz mirror://gentoo/texlive-module-fitbox-2019.tar.xz mirror://gentoo/texlive-module-flowchart-2019.tar.xz mirror://gentoo/texlive-module-forest-2019.tar.xz mirror://gentoo/texlive-module-genealogytree-2019.tar.xz mirror://gentoo/texlive-module-getmap-2019.tar.xz mirror://gentoo/texlive-module-gincltex-2019.tar.xz mirror://gentoo/texlive-module-gnuplottex-2019.tar.xz mirror://gentoo/texlive-module-gradientframe-2019.tar.xz mirror://gentoo/texlive-module-grafcet-2019.tar.xz mirror://gentoo/texlive-module-graph35-2019.tar.xz mirror://gentoo/texlive-module-graphicxpsd-2019.tar.xz mirror://gentoo/texlive-module-graphviz-2019.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees-2019.tar.xz mirror://gentoo/texlive-module-harveyballs-2019.tar.xz mirror://gentoo/texlive-module-here-2019.tar.xz mirror://gentoo/texlive-module-hf-tikz-2019.tar.xz mirror://gentoo/texlive-module-hobby-2019.tar.xz mirror://gentoo/texlive-module-hvfloat-2019.tar.xz mirror://gentoo/texlive-module-istgame-2019.tar.xz mirror://gentoo/texlive-module-knitting-2019.tar.xz mirror://gentoo/texlive-module-knittingpattern-2019.tar.xz mirror://gentoo/texlive-module-ladder-2019.tar.xz mirror://gentoo/texlive-module-lapdf-2019.tar.xz mirror://gentoo/texlive-module-latex-make-2019.tar.xz mirror://gentoo/texlive-module-lpic-2019.tar.xz mirror://gentoo/texlive-module-lroundrect-2019.tar.xz mirror://gentoo/texlive-module-luamesh-2019.tar.xz mirror://gentoo/texlive-module-luasseq-2019.tar.xz mirror://gentoo/texlive-module-maker-2019.tar.xz mirror://gentoo/texlive-module-makeshape-2019.tar.xz mirror://gentoo/texlive-module-mathspic-2019.tar.xz mirror://gentoo/texlive-module-milsymb-2019.tar.xz mirror://gentoo/texlive-module-miniplot-2019.tar.xz mirror://gentoo/texlive-module-mkpic-2019.tar.xz mirror://gentoo/texlive-module-modiagram-2019.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2019.tar.xz mirror://gentoo/texlive-module-numericplots-2019.tar.xz mirror://gentoo/texlive-module-pb-diagram-2019.tar.xz mirror://gentoo/texlive-module-penrose-2019.tar.xz mirror://gentoo/texlive-module-petri-nets-2019.tar.xz mirror://gentoo/texlive-module-pgf-blur-2019.tar.xz mirror://gentoo/texlive-module-pgf-cmykshadings-2019.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2019.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2019.tar.xz mirror://gentoo/texlive-module-pgfgantt-2019.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2019.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2019.tar.xz mirror://gentoo/texlive-module-pgfmorepages-2019.tar.xz mirror://gentoo/texlive-module-pgfopts-2019.tar.xz mirror://gentoo/texlive-module-pgfornament-2019.tar.xz mirror://gentoo/texlive-module-pgfplots-2019.tar.xz mirror://gentoo/texlive-module-picinpar-2019.tar.xz mirror://gentoo/texlive-module-pict2e-2019.tar.xz mirror://gentoo/texlive-module-pictex-2019.tar.xz mirror://gentoo/texlive-module-pictex2-2019.tar.xz mirror://gentoo/texlive-module-pinlabel-2019.tar.xz mirror://gentoo/texlive-module-pixelart-2019.tar.xz mirror://gentoo/texlive-module-pmgraph-2019.tar.xz mirror://gentoo/texlive-module-postage-2019.tar.xz mirror://gentoo/texlive-module-prerex-2019.tar.xz mirror://gentoo/texlive-module-productbox-2019.tar.xz mirror://gentoo/texlive-module-ptolemaicastronomy-2019.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2019.tar.xz mirror://gentoo/texlive-module-qcircuit-2019.tar.xz mirror://gentoo/texlive-module-quantikz-2019.tar.xz mirror://gentoo/texlive-module-qrcode-2019.tar.xz mirror://gentoo/texlive-module-randbild-2019.tar.xz mirror://gentoo/texlive-module-randomwalk-2019.tar.xz mirror://gentoo/texlive-module-realhats-2019.tar.xz mirror://gentoo/texlive-module-reotex-2019.tar.xz mirror://gentoo/texlive-module-rviewport-2019.tar.xz mirror://gentoo/texlive-module-sa-tikz-2019.tar.xz mirror://gentoo/texlive-module-schemabloc-2019.tar.xz mirror://gentoo/texlive-module-scsnowman-2019.tar.xz mirror://gentoo/texlive-module-scratch-2019.tar.xz mirror://gentoo/texlive-module-scratch3-2019.tar.xz mirror://gentoo/texlive-module-setdeck-2019.tar.xz mirror://gentoo/texlive-module-signchart-2019.tar.xz mirror://gentoo/texlive-module-smartdiagram-2019.tar.xz mirror://gentoo/texlive-module-spath3-2019.tar.xz mirror://gentoo/texlive-module-spectralsequences-2019.tar.xz mirror://gentoo/texlive-module-swimgraf-2019.tar.xz mirror://gentoo/texlive-module-table-fct-2019.tar.xz mirror://gentoo/texlive-module-texdraw-2019.tar.xz mirror://gentoo/texlive-module-ticollege-2019.tar.xz mirror://gentoo/texlive-module-tipfr-2019.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2019.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2019.tar.xz mirror://gentoo/texlive-module-tikz-cd-2019.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2019.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynhand-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2019.tar.xz mirror://gentoo/texlive-module-tikz-imagelabels-2019.tar.xz mirror://gentoo/texlive-module-tikz-inet-2019.tar.xz mirror://gentoo/texlive-module-tikz-kalender-2019.tar.xz mirror://gentoo/texlive-module-tikz-karnaugh-2019.tar.xz mirror://gentoo/texlive-module-tikz-ladder-2019.tar.xz mirror://gentoo/texlive-module-tikz-layers-2019.tar.xz mirror://gentoo/texlive-module-tikz-nef-2019.tar.xz mirror://gentoo/texlive-module-tikz-network-2019.tar.xz mirror://gentoo/texlive-module-tikz-opm-2019.tar.xz mirror://gentoo/texlive-module-tikz-optics-2019.tar.xz mirror://gentoo/texlive-module-tikz-page-2019.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2019.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2019.tar.xz mirror://gentoo/texlive-module-tikz-relay-2019.tar.xz mirror://gentoo/texlive-module-tikz-sfc-2019.tar.xz mirror://gentoo/texlive-module-tikz-timing-2019.tar.xz mirror://gentoo/texlive-module-tikz-truchet-2019.tar.xz mirror://gentoo/texlive-module-tikzcodeblocks-2019.tar.xz mirror://gentoo/texlive-module-tikzducks-2019.tar.xz mirror://gentoo/texlive-module-tikzinclude-2019.tar.xz mirror://gentoo/texlive-module-tikzlings-2019.tar.xz mirror://gentoo/texlive-module-tikzmark-2019.tar.xz mirror://gentoo/texlive-module-tikzmarmots-2019.tar.xz mirror://gentoo/texlive-module-tikzorbital-2019.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2019.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2019.tar.xz mirror://gentoo/texlive-module-tikzpeople-2019.tar.xz mirror://gentoo/texlive-module-tikzposter-2019.tar.xz mirror://gentoo/texlive-module-tikzscale-2019.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2019.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2019.tar.xz mirror://gentoo/texlive-module-tqft-2019.tar.xz mirror://gentoo/texlive-module-tkz-base-2019.tar.xz mirror://gentoo/texlive-module-tkz-berge-2019.tar.xz mirror://gentoo/texlive-module-tkz-doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2019.tar.xz mirror://gentoo/texlive-module-tkz-fct-2019.tar.xz mirror://gentoo/texlive-module-tkz-graph-2019.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2019.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2019.tar.xz mirror://gentoo/texlive-module-tkz-orm-2019.tar.xz mirror://gentoo/texlive-module-tkz-tab-2019.tar.xz mirror://gentoo/texlive-module-tsemlines-2019.tar.xz mirror://gentoo/texlive-module-tufte-latex-2019.tar.xz mirror://gentoo/texlive-module-venndiagram-2019.tar.xz mirror://gentoo/texlive-module-visualpstricks-2019.tar.xz mirror://gentoo/texlive-module-xpicture-2019.tar.xz mirror://gentoo/texlive-module-xypic-2019.tar.xz mirror://gentoo/texlive-module-collection-pictures-2019.tar.xz doc? ( mirror://gentoo/texlive-module-adigraph.doc-2019.tar.xz mirror://gentoo/texlive-module-aobs-tikz.doc-2019.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2019.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2019.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2019.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2019.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2019.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2019.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2019.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2019.tar.xz mirror://gentoo/texlive-module-bloques.doc-2019.tar.xz mirror://gentoo/texlive-module-blox.doc-2019.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2019.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2019.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2019.tar.xz mirror://gentoo/texlive-module-braids.doc-2019.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2019.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2019.tar.xz mirror://gentoo/texlive-module-callouts.doc-2019.tar.xz mirror://gentoo/texlive-module-celtic.doc-2019.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2019.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2019.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2019.tar.xz mirror://gentoo/texlive-module-curve.doc-2019.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2019.tar.xz mirror://gentoo/texlive-module-curves.doc-2019.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2019.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2019.tar.xz mirror://gentoo/texlive-module-ditaa.doc-2019.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2019.tar.xz mirror://gentoo/texlive-module-dottex.doc-2019.tar.xz mirror://gentoo/texlive-module-dratex.doc-2019.tar.xz mirror://gentoo/texlive-module-drs.doc-2019.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2019.tar.xz mirror://gentoo/texlive-module-dynkin-diagrams.doc-2019.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2019.tar.xz mirror://gentoo/texlive-module-eepic.doc-2019.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2019.tar.xz mirror://gentoo/texlive-module-endofproofwd.doc-2019.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2019.tar.xz mirror://gentoo/texlive-module-esk.doc-2019.tar.xz mirror://gentoo/texlive-module-euflag.doc-2019.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2019.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2019.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2019.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2019.tar.xz mirror://gentoo/texlive-module-forest.doc-2019.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2019.tar.xz mirror://gentoo/texlive-module-getmap.doc-2019.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2019.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2019.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2019.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2019.tar.xz mirror://gentoo/texlive-module-graph35.doc-2019.tar.xz mirror://gentoo/texlive-module-graphicxpsd.doc-2019.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2019.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.doc-2019.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2019.tar.xz mirror://gentoo/texlive-module-here.doc-2019.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2019.tar.xz mirror://gentoo/texlive-module-hobby.doc-2019.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-istgame.doc-2019.tar.xz mirror://gentoo/texlive-module-knitting.doc-2019.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2019.tar.xz mirror://gentoo/texlive-module-ladder.doc-2019.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2019.tar.xz mirror://gentoo/texlive-module-lpic.doc-2019.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2019.tar.xz mirror://gentoo/texlive-module-luamesh.doc-2019.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2019.tar.xz mirror://gentoo/texlive-module-maker.doc-2019.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2019.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2019.tar.xz mirror://gentoo/texlive-module-milsymb.doc-2019.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2019.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2019.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2019.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2019.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2019.tar.xz mirror://gentoo/texlive-module-penrose.doc-2019.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-cmykshadings.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfmorepages.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2019.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2019.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2019.tar.xz mirror://gentoo/texlive-module-pictex.doc-2019.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2019.tar.xz mirror://gentoo/texlive-module-pixelart.doc-2019.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2019.tar.xz mirror://gentoo/texlive-module-postage.doc-2019.tar.xz mirror://gentoo/texlive-module-prerex.doc-2019.tar.xz mirror://gentoo/texlive-module-productbox.doc-2019.tar.xz mirror://gentoo/texlive-module-ptolemaicastronomy.doc-2019.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2019.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2019.tar.xz mirror://gentoo/texlive-module-quantikz.doc-2019.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2019.tar.xz mirror://gentoo/texlive-module-randbild.doc-2019.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2019.tar.xz mirror://gentoo/texlive-module-realhats.doc-2019.tar.xz mirror://gentoo/texlive-module-reotex.doc-2019.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2019.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2019.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2019.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2019.tar.xz mirror://gentoo/texlive-module-scratch.doc-2019.tar.xz mirror://gentoo/texlive-module-scratch3.doc-2019.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2019.tar.xz mirror://gentoo/texlive-module-signchart.doc-2019.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-spath3.doc-2019.tar.xz mirror://gentoo/texlive-module-spectralsequences.doc-2019.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2019.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2019.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2019.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2019.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynhand.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-imagelabels.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-kalender.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-karnaugh.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-ladder.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-layers.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-nef.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-network.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-relay.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-sfc.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-truchet.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzcodeblocks.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzducks.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzlings.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzmarmots.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2019.tar.xz mirror://gentoo/texlive-module-tqft.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2019.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2019.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2019.tar.xz mirror://gentoo/texlive-module-xypic.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2019.tar.xz mirror://gentoo/texlive-module-asyfig.source-2019.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2019.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2019.tar.xz mirror://gentoo/texlive-module-binarytree.source-2019.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2019.tar.xz mirror://gentoo/texlive-module-blox.source-2019.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2019.tar.xz mirror://gentoo/texlive-module-braids.source-2019.tar.xz mirror://gentoo/texlive-module-celtic.source-2019.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2019.tar.xz mirror://gentoo/texlive-module-curve.source-2019.tar.xz mirror://gentoo/texlive-module-curve2e.source-2019.tar.xz mirror://gentoo/texlive-module-curves.source-2019.tar.xz mirror://gentoo/texlive-module-dottex.source-2019.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2019.tar.xz mirror://gentoo/texlive-module-ellipse.source-2019.tar.xz mirror://gentoo/texlive-module-esk.source-2019.tar.xz mirror://gentoo/texlive-module-euflag.source-2019.tar.xz mirror://gentoo/texlive-module-fitbox.source-2019.tar.xz mirror://gentoo/texlive-module-flowchart.source-2019.tar.xz mirror://gentoo/texlive-module-forest.source-2019.tar.xz mirror://gentoo/texlive-module-gincltex.source-2019.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2019.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2019.tar.xz mirror://gentoo/texlive-module-graph35.source-2019.tar.xz mirror://gentoo/texlive-module-graphviz.source-2019.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.source-2019.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2019.tar.xz mirror://gentoo/texlive-module-hobby.source-2019.tar.xz mirror://gentoo/texlive-module-latex-make.source-2019.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2019.tar.xz mirror://gentoo/texlive-module-luasseq.source-2019.tar.xz mirror://gentoo/texlive-module-makeshape.source-2019.tar.xz mirror://gentoo/texlive-module-penrose.source-2019.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2019.tar.xz mirror://gentoo/texlive-module-pgf-cmykshadings.source-2019.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2019.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2019.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2019.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2019.tar.xz mirror://gentoo/texlive-module-pict2e.source-2019.tar.xz mirror://gentoo/texlive-module-pixelart.source-2019.tar.xz mirror://gentoo/texlive-module-postage.source-2019.tar.xz mirror://gentoo/texlive-module-productbox.source-2019.tar.xz mirror://gentoo/texlive-module-ptolemaicastronomy.source-2019.tar.xz mirror://gentoo/texlive-module-qrcode.source-2019.tar.xz mirror://gentoo/texlive-module-randbild.source-2019.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2019.tar.xz mirror://gentoo/texlive-module-realhats.source-2019.tar.xz mirror://gentoo/texlive-module-rviewport.source-2019.tar.xz mirror://gentoo/texlive-module-signchart.source-2019.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2019.tar.xz mirror://gentoo/texlive-module-spath3.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-imagelabels.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-truchet.source-2019.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2019.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2019.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2019.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2019.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2019.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2019.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2019.tar.xz mirror://gentoo/texlive-module-tqft.source-2019.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2019.tar.xz mirror://gentoo/texlive-module-xpicture.source-2019.tar.xz ) _eclasses_=texlive-common 9e2ec6f6212b1eed3c02777654057d2b texlive-module 6eb4d8a3a8a9065875db0daec376bdfc +<<<<<<< HEAD +_md5_=c40989ed8e25eb303f61fbe5ca1109dd +======= _md5_=4fccde1ca2cd07c82b2581780d6fc105 +>>>>>>> next diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2019 b/metadata/md5-cache/dev-texlive/texlive-xetex-2019 index 4fb9f59cda53..9810ff34458c 100644 --- a/metadata/md5-cache/dev-texlive/texlive-xetex-2019 +++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2019 @@ -10,4 +10,8 @@ RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latexextra-2010 > SLOT=0 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2019.tar.xz mirror://gentoo/texlive-module-awesomebox-2019.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2019.tar.xz mirror://gentoo/texlive-module-bidicontour-2019.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2019.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2019.tar.xz mirror://gentoo/texlive-module-bidipresentation-2019.tar.xz mirror://gentoo/texlive-module-businesscard-qrcode-2019.tar.xz mirror://gentoo/texlive-module-cqubeamer-2019.tar.xz mirror://gentoo/texlive-module-fixlatvian-2019.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2019.tar.xz mirror://gentoo/texlive-module-fontbook-2019.tar.xz mirror://gentoo/texlive-module-fontwrap-2019.tar.xz mirror://gentoo/texlive-module-interchar-2019.tar.xz mirror://gentoo/texlive-module-na-position-2019.tar.xz mirror://gentoo/texlive-module-philokalia-2019.tar.xz mirror://gentoo/texlive-module-ptext-2019.tar.xz mirror://gentoo/texlive-module-quran-2019.tar.xz mirror://gentoo/texlive-module-quran-de-2019.tar.xz mirror://gentoo/texlive-module-realscripts-2019.tar.xz mirror://gentoo/texlive-module-simple-resume-cv-2019.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation-2019.tar.xz mirror://gentoo/texlive-module-tetragonos-2019.tar.xz mirror://gentoo/texlive-module-ucharclasses-2019.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2019.tar.xz mirror://gentoo/texlive-module-unisugar-2019.tar.xz mirror://gentoo/texlive-module-xebaposter-2019.tar.xz mirror://gentoo/texlive-module-xechangebar-2019.tar.xz mirror://gentoo/texlive-module-xecjk-2019.tar.xz mirror://gentoo/texlive-module-xecolor-2019.tar.xz mirror://gentoo/texlive-module-xecyr-2019.tar.xz mirror://gentoo/texlive-module-xeindex-2019.tar.xz mirror://gentoo/texlive-module-xesearch-2019.tar.xz mirror://gentoo/texlive-module-xespotcolor-2019.tar.xz mirror://gentoo/texlive-module-xetex-2019.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2019.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2019.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2019.tar.xz mirror://gentoo/texlive-module-xetexconfig-2019.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2019.tar.xz mirror://gentoo/texlive-module-xetexko-2019.tar.xz mirror://gentoo/texlive-module-xevlna-2019.tar.xz mirror://gentoo/texlive-module-collection-xetex-2019.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2019.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2019.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2019.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2019.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2019.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2019.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2019.tar.xz mirror://gentoo/texlive-module-businesscard-qrcode.doc-2019.tar.xz mirror://gentoo/texlive-module-cqubeamer.doc-2019.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2019.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2019.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2019.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2019.tar.xz mirror://gentoo/texlive-module-interchar.doc-2019.tar.xz mirror://gentoo/texlive-module-na-position.doc-2019.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2019.tar.xz mirror://gentoo/texlive-module-ptext.doc-2019.tar.xz mirror://gentoo/texlive-module-quran.doc-2019.tar.xz mirror://gentoo/texlive-module-quran-de.doc-2019.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2019.tar.xz mirror://gentoo/texlive-module-simple-resume-cv.doc-2019.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation.doc-2019.tar.xz mirror://gentoo/texlive-module-tetragonos.doc-2019.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2019.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2019.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2019.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2019.tar.xz mirror://gentoo/texlive-module-xechangebar.doc-2019.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2019.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2019.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2019.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2019.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2019.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2019.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2019.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2019.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2019.tar.xz mirror://gentoo/texlive-module-fontbook.source-2019.tar.xz mirror://gentoo/texlive-module-philokalia.source-2019.tar.xz mirror://gentoo/texlive-module-realscripts.source-2019.tar.xz mirror://gentoo/texlive-module-xecjk.source-2019.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2019.tar.xz ) _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 font ad294a9d8ad2062ab60ec9d97079eaa0 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 texlive-common 9e2ec6f6212b1eed3c02777654057d2b texlive-module 6eb4d8a3a8a9065875db0daec376bdfc toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +<<<<<<< HEAD +_md5_=c182db2dfddc53f91db338af994ebb3c +======= _md5_=091996cf5dfbda46dccbaa739ddfdf7e +>>>>>>> next diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz Binary files differindex a13bc032046a..c1923ac0454b 100644 --- a/metadata/md5-cache/dev-util/Manifest.gz +++ b/metadata/md5-cache/dev-util/Manifest.gz diff --git a/metadata/md5-cache/dev-util/bless-0.6.2 b/metadata/md5-cache/dev-util/bless-0.6.2 new file mode 100644 index 000000000000..d5ea5d606144 --- /dev/null +++ b/metadata/md5-cache/dev-util/bless-0.6.2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup +DEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21 app-text/rarian >=sys-devel/gettext-0.15 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info +DESCRIPTION=GTK# Hex Editor +EAPI=6 +HOMEPAGE=https://github.com/afrantzis/Bless/ +IUSE=debug +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2+ +RDEPEND=>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12.21 +RESTRICT=test +SLOT=0 +SRC_URI=https://github.com/afrantzis/bless/archive/v0.6.2.tar.gz -> bless-0.6.2.tar.gz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mono-env 1f24c032c78290b0d9a07d5b343051a7 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=6da13233ec04ced2aad3c752a0a65cd7 diff --git a/metadata/md5-cache/dev-util/clion-2019.2.1 b/metadata/md5-cache/dev-util/clion-2019.2.1 index 765e23d02ed4..5599de6e8018 100644 --- a/metadata/md5-cache/dev-util/clion-2019.2.1 +++ b/metadata/md5-cache/dev-util/clion-2019.2.1 @@ -4,10 +4,10 @@ EAPI=7 HOMEPAGE=https://www.jetbrains.com/clion IUSE=custom-jdk KEYWORDS=~amd64 ~x86 -LICENSE=|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB +LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) RDEPEND=dev-util/cmake sys-devel/gdb !custom-jdk? ( virtual/jdk ) -RESTRICT=bindist mirror splitdebug +RESTRICT=mirror splitdebug SLOT=0 SRC_URI=https://download.jetbrains.com/cpp/CLion-2019.2.1.tar.gz -> clion-2019.2.1.tar.gz _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 -_md5_=646d6a30b22c480601ee6f5bde677a69 +_md5_=1d49cd52b8266cae0be7ab1d0ca63c61 diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999 index 39fbb8c4eb8f..bb614d4e13c0 100644 --- a/metadata/md5-cache/dev-util/heaptrack-9999 +++ b/metadata/md5-cache/dev-util/heaptrack-9999 @@ -9,5 +9,9 @@ LICENSE=LGPL-2.1 PROPERTIES=live RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kconfigwidgets-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kio-5.60.0 >=kde-frameworks/kitemmodels-5.60.0 >=kde-frameworks/kwidgetsaddons-5.60.0 >=kde-frameworks/threadweaver-5.60.0 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) qt5? ( >=kde-frameworks/kf-env-4 ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ebe283f7a994ff47a9b8810d66d9ad9e diff --git a/metadata/md5-cache/dev-util/kdbg-3.0.0-r1 b/metadata/md5-cache/dev-util/kdbg-3.0.0-r1 index 8e4ef3bf9ab2..8549f5051bdc 100644 --- a/metadata/md5-cache/dev-util/kdbg-3.0.0-r1 +++ b/metadata/md5-cache/dev-util/kdbg-3.0.0-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !dev-util/kdbg:4 sys-devel/gdb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://sourceforge/kdbg/kdbg-3.0.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0a53e29ac6dc8474b296144ca0d2f2f6 diff --git a/metadata/md5-cache/dev-util/kdevelop-5.3.3 b/metadata/md5-cache/dev-util/kdevelop-5.3.3 index 8d653590a158..311674c4efbb 100644 --- a/metadata/md5-cache/dev-util/kdevelop-5.3.3 +++ b/metadata/md5-cache/dev-util/kdevelop-5.3.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/kdevelop/5.3.3/src/kdevelop-5.3.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=31c2838c4d3d98ea053191ed95393934 diff --git a/metadata/md5-cache/dev-util/kdevelop-5.4.2 b/metadata/md5-cache/dev-util/kdevelop-5.4.2 index adedf4bddb71..9719c74f75dd 100644 --- a/metadata/md5-cache/dev-util/kdevelop-5.4.2 +++ b/metadata/md5-cache/dev-util/kdevelop-5.4.2 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 RESTRICT=test SLOT=5/54 SRC_URI=mirror://kde/stable/kdevelop/5.4.2/src/kdevelop-5.4.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a0e07f926ef0ac9ddb08a4e59f9f90c5 diff --git a/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3-r1 b/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3-r1 index b81ccbfeedef..5f9bf8babd5d 100644 --- a/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3-r1 +++ b/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-util/kdevelop-5.2.3:5 sys-devel/clang:* >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kdev-clang-tidy/0.3.3/src/kdev-clang-tidy-0.3.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c58829787d9c5ed3b612bdd008a533c3 diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0 index a0ecf0f81625..f7f0e7ae8b7a 100644 --- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0 +++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.2.0/src/kdevelop-pg-qt-2.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b3b85f5a4a7b78c81313c5913ab79803 diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.3.3 b/metadata/md5-cache/dev-util/kdevelop-php-5.3.3 index ef5d03ccedf7..2a0aad38f73b 100644 --- a/metadata/md5-cache/dev-util/kdevelop-php-5.3.3 +++ b/metadata/md5-cache/dev-util/kdevelop-php-5.3.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/kdevelop/5.3.3/src/kdev-php-5.3.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=74132dd87bced98d12c2851b63cc9629 diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.4.2 b/metadata/md5-cache/dev-util/kdevelop-php-5.4.2 index a85e428a16ec..0673c2bcd304 100644 --- a/metadata/md5-cache/dev-util/kdevelop-php-5.4.2 +++ b/metadata/md5-cache/dev-util/kdevelop-php-5.4.2 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/kdevelop/5.4.2/src/kdev-php-5.4.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=faa5983e025046520f6fd000157a1f9d diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.3.3 b/metadata/md5-cache/dev-util/kdevelop-python-5.3.3 index 821d2951f7c9..ff2c61df118c 100644 --- a/metadata/md5-cache/dev-util/kdevelop-python-5.3.3 +++ b/metadata/md5-cache/dev-util/kdevelop-python-5.3.3 @@ -12,5 +12,9 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/kdevelop/5.3.3/src/kdev-python-5.3.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cbe9a94f664171b9ad383db80e83600f diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.4.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.4.2 index bfe68bf449ee..05d815fccfb7 100644 --- a/metadata/md5-cache/dev-util/kdevelop-python-5.4.2 +++ b/metadata/md5-cache/dev-util/kdevelop-python-5.4.2 @@ -12,5 +12,9 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/kdevelop/5.4.2/src/kdev-python-5.4.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e62b11c4d54b48495e946ab90ed30bfa diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0.9999 b/metadata/md5-cache/dev-util/lldb-10.0.0.9999 index 700f3d277e9c..25bc8bba080d 100644 --- a/metadata/md5-cache/dev-util/lldb-10.0.0.9999 +++ b/metadata/md5-cache/dev-util/lldb-10.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9867df0f83ff6cb3395cc597535e15ae diff --git a/metadata/md5-cache/dev-util/lldb-8.0.1 b/metadata/md5-cache/dev-util/lldb-8.0.1 index 179cb32c7eb2..4d9b8f9cc872 100644 --- a/metadata/md5-cache/dev-util/lldb-8.0.1 +++ b/metadata/md5-cache/dev-util/lldb-8.0.1 @@ -11,5 +11,9 @@ REQUIRED_USE=python_targets_python2_7 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lldb-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=87eda0b5a2306bc0af17a442969e4964 diff --git a/metadata/md5-cache/dev-util/lldb-9.0.0 b/metadata/md5-cache/dev-util/lldb-9.0.0 index da160c67c0f4..72c9f404f3f5 100644 --- a/metadata/md5-cache/dev-util/lldb-9.0.0 +++ b/metadata/md5-cache/dev-util/lldb-9.0.0 @@ -12,5 +12,9 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://releases.llvm.org/9.0.0/lldb-9.0.0.src.tar.xz test? ( https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4b2299a566cb6a1dcc689b0ad75c30c7 diff --git a/metadata/md5-cache/dev-util/lldb-9.0.0.9999 b/metadata/md5-cache/dev-util/lldb-9.0.0.9999 index 6eb5745392a5..120b12f99341 100644 --- a/metadata/md5-cache/dev-util/lldb-9.0.0.9999 +++ b/metadata/md5-cache/dev-util/lldb-9.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=17cac39c79766e42cfffcc2679bfb677 diff --git a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1 index 4d039257213f..a72c9c5813ef 100644 --- a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1 +++ b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2 GPL-3 ) RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3f842fd93b9e6bd3cd8263932b03547f diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r3 b/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r3 index d3a721c24397..847f48bc6b40 100644 --- a/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r3 +++ b/metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r3 @@ -9,5 +9,5 @@ LICENSE=BSD RESTRICT=strip SLOT=0 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v6.0.0.tar.bz2 -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=7c10fa85f2a679dbb3239f4afa98b912 diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.1.114 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.114 index 47fcdb8b30b3..c25f1ba8e139 100644 --- a/metadata/md5-cache/dev-util/vulkan-headers-1.1.114 +++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.114 @@ -7,5 +7,9 @@ KEYWORDS=amd64 x86 LICENSE=Apache-2.0 SLOT=0 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/e3f96a9ccab9397481eb81c4d9bce4ea7590dc33.tar.gz -> vulkan-headers-1.1.114.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0687ddab4e45dd8352262d74b10a197b diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz Binary files differindex 82b255ed76a5..1dc192c9e1e5 100644 --- a/metadata/md5-cache/dev-vcs/Manifest.gz +++ b/metadata/md5-cache/dev-vcs/Manifest.gz diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.1.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.1.0 index 06be4fb22c2f..1705ff74996e 100644 --- a/metadata/md5-cache/dev-vcs/kdesvn-2.1.0 +++ b/metadata/md5-cache/dev-vcs/kdesvn-2.1.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kdesvn/2.1.0/kdesvn-2.1.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f3d2506d4f9d9db5f97846cc33dc9bc2 diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz Binary files differindex c631d0553156..12980223fce3 100644 --- a/metadata/md5-cache/games-action/Manifest.gz +++ b/metadata/md5-cache/games-action/Manifest.gz diff --git a/metadata/md5-cache/games-action/minetest-5.0.1-r3 b/metadata/md5-cache/games-action/minetest-5.0.1-r3 index 20c8fc918ee5..674694939aa8 100644 --- a/metadata/md5-cache/games-action/minetest-5.0.1-r3 +++ b/metadata/md5-cache/games-action/minetest-5.0.1-r3 @@ -11,5 +11,9 @@ RDEPEND=dev-db/sqlite:3 dev-games/irrlicht dev-libs/gmp:0= dev-libs/jsoncpp:= sy REQUIRED_USE=|| ( client server ) SLOT=0 SRC_URI=https://github.com/minetest/minetest/archive/5.0.1.tar.gz -> minetest-5.0.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=50a538e6f9015830b7fc126882cf6205 diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz Binary files differindex 116f9667ad7a..9a95d0bb8d01 100644 --- a/metadata/md5-cache/games-emulation/Manifest.gz +++ b/metadata/md5-cache/games-emulation/Manifest.gz diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz Binary files differindex 8a66101e63f7..33a51de09730 100644 --- a/metadata/md5-cache/games-fps/Manifest.gz +++ b/metadata/md5-cache/games-fps/Manifest.gz diff --git a/metadata/md5-cache/games-fps/doomsday-2.1.1 b/metadata/md5-cache/games-fps/doomsday-2.1.1 index 29c8d24fcaa4..3d3ab5bb789a 100644 --- a/metadata/md5-cache/games-fps/doomsday-2.1.1 +++ b/metadata/md5-cache/games-fps/doomsday-2.1.1 @@ -11,5 +11,9 @@ PDEPEND=demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom ) RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[-gles2] dev-qt/qtnetwork:5= dev-qt/qtopengl:5= dev-qt/qtwidgets:5= dev-qt/qtx11extras:5= media-libs/assimp net-misc/curl sys-libs/zlib fmod? ( media-libs/fmod:1 ) fluidsynth? ( media-sound/fluidsynth:= ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0= ) SLOT=0 SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.1.1/doomsday-2.1.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c18154fb36c92e3ebca7b677689d1b2c diff --git a/metadata/md5-cache/games-fps/gzdoom-4.2.1 b/metadata/md5-cache/games-fps/gzdoom-4.2.1 index 70064535ca90..bb8fd1db9e80 100644 --- a/metadata/md5-cache/games-fps/gzdoom-4.2.1 +++ b/metadata/md5-cache/games-fps/gzdoom-4.2.1 @@ -10,5 +10,5 @@ LICENSE=BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT nonfree? ( Activision ChexQuest3 D RDEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) SLOT=0 SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.2.1.tar.gz -> gzdoom-4.2.1.tar.gz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=457ff7314ddb404a72ead33217ad0290 diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz Binary files differindex 3178fb0e4181..ed8ff2ff39bb 100644 --- a/metadata/md5-cache/games-misc/Manifest.gz +++ b/metadata/md5-cache/games-misc/Manifest.gz diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz Binary files differindex d8a62f5a530e..83d3060d8c0f 100644 --- a/metadata/md5-cache/games-puzzle/Manifest.gz +++ b/metadata/md5-cache/games-puzzle/Manifest.gz diff --git a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225 b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225 index 2462f16cea2b..7b2fc9df02af 100644 --- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225 +++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kio-5.60.0 >=kde-frameworks/kwidgetsaddons-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=https://github.com/KDE/ksokoban/archive/317b1e70a87224c94cac85955a3d666a43527812.tar.gz -> ksokoban-0.5.0_pre20190225.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=68864a4a48ed6d3bdbc8bae02f01c0f3 diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999 index c672d0676e56..bfca8a947d48 100644 --- a/metadata/md5-cache/games-puzzle/ksokoban-9999 +++ b/metadata/md5-cache/games-puzzle/ksokoban-9999 @@ -9,5 +9,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=>=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kio-5.60.0 >=kde-frameworks/kwidgetsaddons-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=eb6c00511783c65739bbb44cf6659acb diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz Binary files differindex 9b32809b780c..27fbd8548d6c 100644 --- a/metadata/md5-cache/games-rpg/Manifest.gz +++ b/metadata/md5-cache/games-rpg/Manifest.gz diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz Binary files differindex 7ee599ea991b..2b4459c321bd 100644 --- a/metadata/md5-cache/games-server/Manifest.gz +++ b/metadata/md5-cache/games-server/Manifest.gz diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz Binary files differindex 996f12040990..f4a28edbb4a1 100644 --- a/metadata/md5-cache/games-strategy/Manifest.gz +++ b/metadata/md5-cache/games-strategy/Manifest.gz diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.12 b/metadata/md5-cache/games-strategy/colobot-0.1.12 index bbc94388d044..30805fdf5a05 100644 --- a/metadata/md5-cache/games-strategy/colobot-0.1.12 +++ b/metadata/md5-cache/games-strategy/colobot-0.1.12 @@ -11,5 +11,9 @@ RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg me RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.12-alpha.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8ab33d4826363e3efac7547630c47b17 diff --git a/metadata/md5-cache/games-strategy/colobot-9999 b/metadata/md5-cache/games-strategy/colobot-9999 index 03491ddd8f67..aea50b9bc34c 100644 --- a/metadata/md5-cache/games-strategy/colobot-9999 +++ b/metadata/md5-cache/games-strategy/colobot-9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools openal? ( media-libs/openal ) games-strategy/colobot-data RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7dfa4fcdd02953bb4129a76059ef45c3 diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 b/metadata/md5-cache/games-strategy/colobot-data-0.1.11 index 3ea15b1174aa..7ed700df17a3 100644 --- a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 +++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.11 @@ -9,5 +9,9 @@ LICENSE=GPL-3 REQUIRED_USE=music? ( ^^ ( music-flac-convert music-ogg ) ) music-flac-convert? ( music ) music-ogg? ( music ) SLOT=0 SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-data-0.1.11.tar.gz music-ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music-flac-convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.tar.gz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3e4bfcfe34f1b8c9d45ac40dec711fa4 diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.12 b/metadata/md5-cache/games-strategy/colobot-data-0.1.12 index fd63b1202890..49a5a72353f9 100644 --- a/metadata/md5-cache/games-strategy/colobot-data-0.1.12 +++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.12 @@ -8,5 +8,9 @@ KEYWORDS=~amd64 LICENSE=GPL-3+ SLOT=0 SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.12-alpha.tar.gz -> colobot-gold-0.1.12-alpha.data.tar.gz music? ( https://colobot.info/files/music/colobot-music_ogg_0.1.12-alpha.tar.gz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=69f3b22451750adf19de1a424139858e diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz Binary files differindex 8d7f5d8b91e0..d0e5025b51ac 100644 --- a/metadata/md5-cache/gnome-base/Manifest.gz +++ b/metadata/md5-cache/gnome-base/Manifest.gz diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1 index 81d23207c2d4..1664df4e5d59 100644 --- a/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1 +++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1 @@ -10,5 +10,9 @@ PDEPEND=app-crypt/pinentry[gnome-keyring] RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh ) SLOT=0 SRC_URI=mirror://gnome/sources/gnome-keyring/3.31/gnome-keyring-3.31.91.tar.xz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=540d8be75db708bb2c7d899f43d1ebc6 diff --git a/metadata/md5-cache/gnome-base/nautilus-3.32.3 b/metadata/md5-cache/gnome-base/nautilus-3.32.3 index 74178bc9b8d0..a74250a84331 100644 --- a/metadata/md5-cache/gnome-base/nautilus-3.32.3 +++ b/metadata/md5-cache/gnome-base/nautilus-3.32.3 @@ -8,8 +8,16 @@ IUSE=gnome +gstreamer gtk-doc +introspection packagekit +previewer seccomp selin KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux LICENSE=GPL-3+ LGPL-2.1+ PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)] +<<<<<<< HEAD +RDEPEND=>=dev-libs/glib-2.58.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) +SLOT=0 +SRC_URI=mirror://gnome/sources/nautilus/3.32/nautilus-3.32.3.tar.xz +_eclasses_=gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 532371cfcba45b2ab0d2950547c97d95 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=e6b8ca45af2becaae37b9ada48099c02 +======= RDEPEND=>=dev-libs/glib-2.58.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) >=app-misc/tracker-miners-2.0:= SLOT=0 SRC_URI=mirror://gnome/sources/nautilus/3.32/nautilus-3.32.3.tar.xz _eclasses_=gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 532371cfcba45b2ab0d2950547c97d95 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=c5b3bf44183aaa0f6907964444f6a3e9 +>>>>>>> next diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz Binary files differindex bb1aa63c07aa..82f41069737e 100644 --- a/metadata/md5-cache/gnome-extra/Manifest.gz +++ b/metadata/md5-cache/gnome-extra/Manifest.gz diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz Binary files differindex d336f4537133..01183af9dfd7 100644 --- a/metadata/md5-cache/gnustep-apps/Manifest.gz +++ b/metadata/md5-cache/gnustep-apps/Manifest.gz diff --git a/metadata/md5-cache/gnustep-apps/sogo-4.0.8 b/metadata/md5-cache/gnustep-apps/sogo-4.0.8 index 6c163a6b857a..abab077b166b 100644 --- a/metadata/md5-cache/gnustep-apps/sogo-4.0.8 +++ b/metadata/md5-cache/gnustep-apps/sogo-4.0.8 @@ -9,5 +9,5 @@ LICENSE=GPL-2 RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.0.8[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 ) SLOT=0 SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-4.0.8.tar.gz -> sogo-4.0.8.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnustep-2 836726825908137cacbf1063f76adb4c gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnustep-2 836726825908137cacbf1063f76adb4c gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd _md5_=5ec61a7511a4d00487243064d571bd43 diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz Binary files differindex 4ea4ce49371c..dfabc16caa39 100644 --- a/metadata/md5-cache/gnustep-libs/Manifest.gz +++ b/metadata/md5-cache/gnustep-libs/Manifest.gz diff --git a/metadata/md5-cache/gnustep-libs/sope-4.0.8 b/metadata/md5-cache/gnustep-libs/sope-4.0.8 index 9f7f19084106..7e7c2b8488cb 100644 --- a/metadata/md5-cache/gnustep-libs/sope-4.0.8 +++ b/metadata/md5-cache/gnustep-libs/sope-4.0.8 @@ -9,5 +9,5 @@ LICENSE=LGPL-2 RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 ) SLOT=0 SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-4.0.8.tar.gz -> sope-4.0.8.tar.gz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnustep-2 836726825908137cacbf1063f76adb4c gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnustep-2 836726825908137cacbf1063f76adb4c gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd _md5_=d380502166c2240b3ca14b7c4c9c6af1 diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz Binary files differindex 6206a3bc1f26..67a99744adbe 100644 --- a/metadata/md5-cache/kde-apps/Manifest.gz +++ b/metadata/md5-cache/kde-apps/Manifest.gz diff --git a/metadata/md5-cache/kde-apps/akonadi-19.04.3-r1 b/metadata/md5-cache/kde-apps/akonadi-19.04.3-r1 index 2185734875e9..e1b65f6f1b32 100644 --- a/metadata/md5-cache/kde-apps/akonadi-19.04.3-r1 +++ b/metadata/md5-cache/kde-apps/akonadi-19.04.3-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools ) RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ff0af5abcf7924e3256ceadd951a95cd diff --git a/metadata/md5-cache/kde-apps/akonadi-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-19.08.1 index b0243da49918..717f018a8adb 100644 --- a/metadata/md5-cache/kde-apps/akonadi-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadi-19.08.1 @@ -12,5 +12,9 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools ) RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cf524a45fe686d35072ccd464a2d2674 diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-19.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-19.04.3 index ef5240bbc752..d2ff7393573a 100644 --- a/metadata/md5-cache/kde-apps/akonadi-calendar-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadi-calendar-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kd RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-calendar-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b0cac715efa471811c2653d1009212fb diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1 b/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1 index 035b4b6015fd..990478b66ba5 100644 --- a/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1 +++ b/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kd RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cc1392facca84c38dcaf09ec15a15123 diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-19.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-19.04.3 index a219970abd14..96ed97cc2301 100644 --- a/metadata/md5-cache/kde-apps/akonadi-contacts-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadi-contacts-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-contacts-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=530ee7e043d74a24730107ebc5c99dbb diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-19.08.1 index c01d68597192..08c971db4f59 100644 --- a/metadata/md5-cache/kde-apps/akonadi-contacts-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadi-contacts-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-contacts-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e29b53985a799378a2bd2fc6353b4886 diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.04.3 index 7114537b3d6a..a4697199980e 100644 --- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/kmailtransport-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/mailcommon-19.04.3:5 >=kde-apps/mailimporter-19.04.3:5 >=kde-apps/messagelib-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-import-wizard-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fa632a70962f04d06544a0ab6ad96b6c diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.08.1 index f83bb876e747..43e25e44e30b 100644 --- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/mailimporter-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-import-wizard-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=29bd146c4bb91292baa10ba0c5e9ad4c diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-19.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-19.04.3 index 53ec6933b29b..4d64123803cb 100644 --- a/metadata/md5-cache/kde-apps/akonadi-mime-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadi-mime-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-mime-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=579d673a65389ff8f6bcacc881cbc80e diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-mime-19.08.1 index 35e1362bfb7e..a1ea71eff1c1 100644 --- a/metadata/md5-cache/kde-apps/akonadi-mime-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadi-mime-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-mime-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=817b2e1e39de6be0dded67c3dc6e8684 diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-19.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-19.04.3 index 2f32262a5b5d..811a4cbb24f3 100644 --- a/metadata/md5-cache/kde-apps/akonadi-notes-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadi-notes-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/kmime-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-notes-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e00140c795a772a9545abf3b31769ce4 diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-notes-19.08.1 index df4d7cc3f43b..c3ba8b5b9644 100644 --- a/metadata/md5-cache/kde-apps/akonadi-notes-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadi-notes-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-notes-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=966d04bee273dd59d7b6893c43c06da9 diff --git a/metadata/md5-cache/kde-apps/akonadi-search-19.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-19.04.3 index ee157988e04d..9e08aa9d4eaf 100644 --- a/metadata/md5-cache/kde-apps/akonadi-search-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadi-search-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-mime-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/xapian-1.3:=[chert(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-search-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fe37e2c5ac6fcedc2dd396ba416fa352 diff --git a/metadata/md5-cache/kde-apps/akonadi-search-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-search-19.08.1 index c8118206bfab..ae7ca953946c 100644 --- a/metadata/md5-cache/kde-apps/akonadi-search-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadi-search-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/xapian-1.3:=[chert(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-search-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f7fb5786a5cf68c73a31a259608a684b diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-19.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-19.04.3 index 6a604dddb75b..598cdd8673bf 100644 --- a/metadata/md5-cache/kde-apps/akonadiconsole-19.04.3 +++ b/metadata/md5-cache/kde-apps/akonadiconsole-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/akonadi-search-19.04.3:5 >=kde-apps/calendarsupport-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/messagelib-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadiconsole-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=88a9556578b2ef2777dec92088cba0ac diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-19.08.1 b/metadata/md5-cache/kde-apps/akonadiconsole-19.08.1 index 4a84d2abcea0..3aa8b27784df 100644 --- a/metadata/md5-cache/kde-apps/akonadiconsole-19.08.1 +++ b/metadata/md5-cache/kde-apps/akonadiconsole-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-search-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadiconsole-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=de0d2eccb3c45f1a43091a9794fc181b diff --git a/metadata/md5-cache/kde-apps/akregator-19.04.3 b/metadata/md5-cache/kde-apps/akregator-19.04.3 index 9483d51c8a51..c0c830caf81b 100644 --- a/metadata/md5-cache/kde-apps/akregator-19.04.3 +++ b/metadata/md5-cache/kde-apps/akregator-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 >=kde-apps/grantleetheme-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/messagelib-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akregator-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3e923194f99258abadedf114baa8b077 diff --git a/metadata/md5-cache/kde-apps/akregator-19.08.1 b/metadata/md5-cache/kde-apps/akregator-19.08.1 index 6f9c41135c70..c86710c19ee7 100644 --- a/metadata/md5-cache/kde-apps/akregator-19.08.1 +++ b/metadata/md5-cache/kde-apps/akregator-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/kontactinterface-19.08.1:5 >=kde-apps/kpimtextedit-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akregator-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=343f1489e51db605dd5714c9bdb1d88d diff --git a/metadata/md5-cache/kde-apps/analitza-19.04.3 b/metadata/md5-cache/kde-apps/analitza-19.04.3 index 66c64b00f09e..4a773edcc8eb 100644 --- a/metadata/md5-cache/kde-apps/analitza-19.04.3 +++ b/metadata/md5-cache/kde-apps/analitza-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/analitza-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5a048ab058759fdaddbfdf8dd9312ec4 diff --git a/metadata/md5-cache/kde-apps/analitza-19.08.1 b/metadata/md5-cache/kde-apps/analitza-19.08.1 index 2e90c0abffb7..ad07af235275 100644 --- a/metadata/md5-cache/kde-apps/analitza-19.08.1 +++ b/metadata/md5-cache/kde-apps/analitza-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/analitza-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b1b485e90ab9179443167c7be1cc4999 diff --git a/metadata/md5-cache/kde-apps/ark-19.04.3 b/metadata/md5-cache/kde-apps/ark-19.04.3 index b69c8a8097df..312f1cef4093 100644 --- a/metadata/md5-cache/kde-apps/ark-19.04.3 +++ b/metadata/md5-cache/kde-apps/ark-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ark-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2fa2cdeac3dba707ab663d85704dc338 diff --git a/metadata/md5-cache/kde-apps/ark-19.08.1 b/metadata/md5-cache/kde-apps/ark-19.08.1 index f91abcdebe73..99cec3e54865 100644 --- a/metadata/md5-cache/kde-apps/ark-19.08.1 +++ b/metadata/md5-cache/kde-apps/ark-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ark-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1301444bbe0e6ef6a0b993ee3759d12b diff --git a/metadata/md5-cache/kde-apps/artikulate-19.04.3 b/metadata/md5-cache/kde-apps/artikulate-19.04.3 index 82d5270d6afc..3d40471efbc9 100644 --- a/metadata/md5-cache/kde-apps/artikulate-19.04.3 +++ b/metadata/md5-cache/kde-apps/artikulate-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k REQUIRED_USE=|| ( gstreamer qtmedia ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/artikulate-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a8f63cb8ab5a222524d3ca49d90e6f41 diff --git a/metadata/md5-cache/kde-apps/artikulate-19.08.1 b/metadata/md5-cache/kde-apps/artikulate-19.08.1 index 1f2a8b32db57..d8d61c7fb485 100644 --- a/metadata/md5-cache/kde-apps/artikulate-19.08.1 +++ b/metadata/md5-cache/kde-apps/artikulate-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k REQUIRED_USE=|| ( gstreamer qtmedia ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/artikulate-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9082d4a853b835a0e8fd10e61f0bb868 diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-19.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-19.04.3 index e4fb960b30a4..10d98cde7cc8 100644 --- a/metadata/md5-cache/kde-apps/audiocd-kio-19.04.3 +++ b/metadata/md5-cache/kde-apps/audiocd-kio-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=kde-apps/libkcompactdisc-19.04.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/audiocd-kio-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1c2dd0f2727a513f40de4668c447e6e3 diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-19.08.1 b/metadata/md5-cache/kde-apps/audiocd-kio-19.08.1 index 9ff92b97bba3..28d591bbc484 100644 --- a/metadata/md5-cache/kde-apps/audiocd-kio-19.08.1 +++ b/metadata/md5-cache/kde-apps/audiocd-kio-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/libkcddb-19.08.1:5 >=kde-apps/libkcompactdisc-19.08.1:5 >=dev-qt/qtwidgets-5.12.3:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/audiocd-kio-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0621fc7bab5189b822fc95668bb67428 diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-19.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-19.04.3 index 70adf4509681..966f7a487a4e 100644 --- a/metadata/md5-cache/kde-apps/baloo-widgets-19.04.3 +++ b/metadata/md5-cache/kde-apps/baloo-widgets-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/baloo-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde- RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/baloo-widgets-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=50df7322fba74332203646540fdc1fdf diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-19.08.1 b/metadata/md5-cache/kde-apps/baloo-widgets-19.08.1 index a4d9ec55ed88..65168e0ae58c 100644 --- a/metadata/md5-cache/kde-apps/baloo-widgets-19.08.1 +++ b/metadata/md5-cache/kde-apps/baloo-widgets-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/baloo-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde- RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/baloo-widgets-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=155af5a3191b4fdb452e9dd494394dd1 diff --git a/metadata/md5-cache/kde-apps/blinken-19.04.3 b/metadata/md5-cache/kde-apps/blinken-19.04.3 index 811f675e1a48..75f7b8e0277e 100644 --- a/metadata/md5-cache/kde-apps/blinken-19.04.3 +++ b/metadata/md5-cache/kde-apps/blinken-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/blinken-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cadb1d158714a8ea3c09f41a1bbf3c6f diff --git a/metadata/md5-cache/kde-apps/blinken-19.08.1 b/metadata/md5-cache/kde-apps/blinken-19.08.1 index 57fe4b31f900..61e3de4346b0 100644 --- a/metadata/md5-cache/kde-apps/blinken-19.08.1 +++ b/metadata/md5-cache/kde-apps/blinken-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/blinken-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6a52cc2e7128cab67f0e52f4881e278f diff --git a/metadata/md5-cache/kde-apps/bomber-19.04.3 b/metadata/md5-cache/kde-apps/bomber-19.04.3 index 0291386bb276..aeb34abe7bb6 100644 --- a/metadata/md5-cache/kde-apps/bomber-19.04.3 +++ b/metadata/md5-cache/kde-apps/bomber-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/bomber-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=db452e0cbc24fddb02f2c55115a9e9ed diff --git a/metadata/md5-cache/kde-apps/bomber-19.08.1 b/metadata/md5-cache/kde-apps/bomber-19.08.1 index cc42ec5c778b..19fc83e1e977 100644 --- a/metadata/md5-cache/kde-apps/bomber-19.08.1 +++ b/metadata/md5-cache/kde-apps/bomber-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/bomber-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=21bf51900d48c3ac58b3107b81022fb9 diff --git a/metadata/md5-cache/kde-apps/bovo-19.04.3 b/metadata/md5-cache/kde-apps/bovo-19.04.3 index 86d443d4deac..af1c02febb18 100644 --- a/metadata/md5-cache/kde-apps/bovo-19.04.3 +++ b/metadata/md5-cache/kde-apps/bovo-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/bovo-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d49c2dd63a1ea4d1a3d090fec2c23d5d diff --git a/metadata/md5-cache/kde-apps/bovo-19.08.1 b/metadata/md5-cache/kde-apps/bovo-19.08.1 index 99038547d017..4c1c845a25bd 100644 --- a/metadata/md5-cache/kde-apps/bovo-19.08.1 +++ b/metadata/md5-cache/kde-apps/bovo-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/bovo-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=37e2707f8a9042f9d8748b1d1e3b5dd6 diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-19.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-19.04.3 index 80b403904c41..ed3e1a2f2974 100644 --- a/metadata/md5-cache/kde-apps/calendarjanitor-19.04.3 +++ b/metadata/md5-cache/kde-apps/calendarjanitor-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-calendar-19.04.3:5 >=kde-apps/calendarsupport-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-calendar-tools-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6ffe9a7f079da22580b997b76bd5d088 diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-19.08.1 b/metadata/md5-cache/kde-apps/calendarjanitor-19.08.1 index 15866aa751d8..76b8ddee0231 100644 --- a/metadata/md5-cache/kde-apps/calendarjanitor-19.08.1 +++ b/metadata/md5-cache/kde-apps/calendarjanitor-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-calendar-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-calendar-tools-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=02654bfdaf8cf12728d731e7dbfd80db diff --git a/metadata/md5-cache/kde-apps/calendarsupport-19.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-19.04.3 index aa5f4b6ada9d..5b44eaf6777c 100644 --- a/metadata/md5-cache/kde-apps/calendarsupport-19.04.3 +++ b/metadata/md5-cache/kde-apps/calendarsupport-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-calendar-19.04.3:5 >=kde-apps/akonadi-mime-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kdepim-apps-libs-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/calendarsupport-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=47eafa8524e42c34e4f31f2a8379c4cf diff --git a/metadata/md5-cache/kde-apps/calendarsupport-19.08.1 b/metadata/md5-cache/kde-apps/calendarsupport-19.08.1 index 8eb4fe1d01ed..4eca5d1ef639 100644 --- a/metadata/md5-cache/kde-apps/calendarsupport-19.08.1 +++ b/metadata/md5-cache/kde-apps/calendarsupport-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-calendar-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/calendarsupport-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d4f2de77816663074bd54d8d95f57e25 diff --git a/metadata/md5-cache/kde-apps/cantor-19.04.3 b/metadata/md5-cache/kde-apps/cantor-19.04.3 index 0b7edd07a12b..691775cff9ad 100644 --- a/metadata/md5-cache/kde-apps/cantor-19.04.3 +++ b/metadata/md5-cache/kde-apps/cantor-19.04.3 @@ -12,5 +12,9 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_ RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/cantor-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fded37166e927754053e542d02bdc9c2 diff --git a/metadata/md5-cache/kde-apps/cantor-19.08.1 b/metadata/md5-cache/kde-apps/cantor-19.08.1 index fe472fbede8d..8a081e47fb05 100644 --- a/metadata/md5-cache/kde-apps/cantor-19.08.1 +++ b/metadata/md5-cache/kde-apps/cantor-19.08.1 @@ -12,5 +12,9 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_ RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/cantor-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aed7ea2485e99e77de34806e43bb7499 diff --git a/metadata/md5-cache/kde-apps/cervisia-19.04.3 b/metadata/md5-cache/kde-apps/cervisia-19.04.3 index 060e4ba670b4..0264c7e9cd7c 100644 --- a/metadata/md5-cache/kde-apps/cervisia-19.04.3 +++ b/metadata/md5-cache/kde-apps/cervisia-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdesu-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/cervisia-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e38492b86f5866e56682eaaffd3af35d diff --git a/metadata/md5-cache/kde-apps/cervisia-19.08.1 b/metadata/md5-cache/kde-apps/cervisia-19.08.1 index 6fbc75e46a87..9e17599113a3 100644 --- a/metadata/md5-cache/kde-apps/cervisia-19.08.1 +++ b/metadata/md5-cache/kde-apps/cervisia-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdesu-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/cervisia-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=09e92016f9c9e7324d727d4f1f780186 diff --git a/metadata/md5-cache/kde-apps/dolphin-19.04.3 b/metadata/md5-cache/kde-apps/dolphin-19.04.3 index 2fc9a9548a3c..269473d92be5 100644 --- a/metadata/md5-cache/kde-apps/dolphin-19.04.3 +++ b/metadata/md5-cache/kde-apps/dolphin-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dolphin-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3004d213850542cbf6f9b9da084311ed diff --git a/metadata/md5-cache/kde-apps/dolphin-19.08.1 b/metadata/md5-cache/kde-apps/dolphin-19.08.1 index 84091f127fa6..614470bf657c 100644 --- a/metadata/md5-cache/kde-apps/dolphin-19.08.1 +++ b/metadata/md5-cache/kde-apps/dolphin-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dolphin-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f67a90a152275617c14912f47fe74d27 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.04.3 index dcf9e43c316e..fbc07c570f51 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.04.3 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/dolphin-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/bzr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=866a38533d2897ea9209a51e0bb8cd04 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.08.1 index af4d1f4af0b6..a2fe9f4da444 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.08.1 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/dolphin-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/bzr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=702e466f871db6925b6a33b27eab9ba0 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.04.3 index 6c854b1be07d..1da22865e080 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.04.3 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/dolphin-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7bda814fd69231594af512169ce20266 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.08.1 index e1bcbcb98528..8756a3d580c6 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.08.1 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/dolphin-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a962431c0bef8f9d77406941678c7027 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.04.3 index 87aea6d6d68c..67f43f7b314e 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.04.3 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/dolphin-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/git >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cf38ca6f82232af6c912bc5af08160f3 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.08.1 index 5628a329d5e6..ef8972dc11d0 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.08.1 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/dolphin-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/git >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8b90a10e8fff505dcd9edbc7e604c599 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.04.3 index 3455873e30ea..a541cbe0bc26 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.04.3 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/dolphin-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ddb47cfcd172bfd32ba836e29d821299 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.08.1 index e9754ecee653..8de1e9370805 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.08.1 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/dolphin-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=45be201b3b9b257c37befed5ac3a0ff9 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.04.3 index 29848d903afd..f58532d93419 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.04.3 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/dolphin-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-19.04.3:5 dev-vcs/subversion >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dolphin-plugins-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c53c267ccff63e596f817cc926b60025 diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.08.1 index e9b96d0e25b5..919ead5c9e79 100644 --- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.08.1 +++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/dolphin-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-19.08.1:5 dev-vcs/subversion >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=79d696dcd820c3e2d3d1683b64f71e43 diff --git a/metadata/md5-cache/kde-apps/dragon-19.04.3 b/metadata/md5-cache/kde-apps/dragon-19.04.3 index 5a0453e4b950..447750ca0738 100644 --- a/metadata/md5-cache/kde-apps/dragon-19.04.3 +++ b/metadata/md5-cache/kde-apps/dragon-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/dragon-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ed35250abf7ed8a94c1b6eab6ea6e511 diff --git a/metadata/md5-cache/kde-apps/dragon-19.08.1 b/metadata/md5-cache/kde-apps/dragon-19.08.1 index 1b078cd389bb..556c9b720ece 100644 --- a/metadata/md5-cache/kde-apps/dragon-19.08.1 +++ b/metadata/md5-cache/kde-apps/dragon-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/dragon-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a77591ec070502683c5c4be8db361075 diff --git a/metadata/md5-cache/kde-apps/eventviews-19.04.3 b/metadata/md5-cache/kde-apps/eventviews-19.04.3 index 33e531f3ce7a..083ba19d8325 100644 --- a/metadata/md5-cache/kde-apps/eventviews-19.04.3 +++ b/metadata/md5-cache/kde-apps/eventviews-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-calendar-19.04.3:5 >=kde-apps/calendarsupport-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/eventviews-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e24ec8819221cced774036b8ce2f7921 diff --git a/metadata/md5-cache/kde-apps/eventviews-19.08.1 b/metadata/md5-cache/kde-apps/eventviews-19.08.1 index 271aa3b8de68..f6e3501db559 100644 --- a/metadata/md5-cache/kde-apps/eventviews-19.08.1 +++ b/metadata/md5-cache/kde-apps/eventviews-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-calendar-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/eventviews-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b51b53adfad9fd58b6732e4a6e2cff4a diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.04.3 index 5a6ebb261d9d..ead15aeec76d 100644 --- a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.04.3 +++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ffmpegthumbs-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fecc6b2218e461177b714506fb509fb2 diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.08.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.08.1 index 4b6998684160..2028520ee5cd 100644 --- a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.08.1 +++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ffmpegthumbs-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1255026d87db1269cc2d049ef0d39aeb diff --git a/metadata/md5-cache/kde-apps/filelight-19.04.3 b/metadata/md5-cache/kde-apps/filelight-19.04.3 index d131763d762c..38de37080921 100644 --- a/metadata/md5-cache/kde-apps/filelight-19.04.3 +++ b/metadata/md5-cache/kde-apps/filelight-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/filelight-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3177408332d417020b9c0502585f4874 diff --git a/metadata/md5-cache/kde-apps/filelight-19.08.1 b/metadata/md5-cache/kde-apps/filelight-19.08.1 index c9149c0e0540..209a0d1a198a 100644 --- a/metadata/md5-cache/kde-apps/filelight-19.08.1 +++ b/metadata/md5-cache/kde-apps/filelight-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/filelight-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=32786fda1f59b28c54c984d8541841a0 diff --git a/metadata/md5-cache/kde-apps/granatier-19.04.3 b/metadata/md5-cache/kde-apps/granatier-19.04.3 index bc54aebdc68a..b57fb3e48b4c 100644 --- a/metadata/md5-cache/kde-apps/granatier-19.04.3 +++ b/metadata/md5-cache/kde-apps/granatier-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/granatier-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d3c2aa3c905e4530ec0e9d2867be29e4 diff --git a/metadata/md5-cache/kde-apps/granatier-19.08.1 b/metadata/md5-cache/kde-apps/granatier-19.08.1 index 0ef650b1b3f5..07ea9fe75a81 100644 --- a/metadata/md5-cache/kde-apps/granatier-19.08.1 +++ b/metadata/md5-cache/kde-apps/granatier-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/granatier-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fad893ceae74f370eb9c6f368522264a diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-19.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-19.04.3 index ff85a8b70377..9f2a383a8875 100644 --- a/metadata/md5-cache/kde-apps/grantlee-editor-19.04.3 +++ b/metadata/md5-cache/kde-apps/grantlee-editor-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-apps/messagelib-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/grantlee-editor-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f81776e7119f610d69d5b6128b6a19fb diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-19.08.1 b/metadata/md5-cache/kde-apps/grantlee-editor-19.08.1 index f01e8e273285..58e5e35b9621 100644 --- a/metadata/md5-cache/kde-apps/grantlee-editor-19.08.1 +++ b/metadata/md5-cache/kde-apps/grantlee-editor-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpimtextedit-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/grantlee-editor-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0f453f9e5bb35b0813c4ad61b366669a diff --git a/metadata/md5-cache/kde-apps/grantleetheme-19.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-19.04.3 index 44d2424400cb..f7951c238fe2 100644 --- a/metadata/md5-cache/kde-apps/grantleetheme-19.04.3 +++ b/metadata/md5-cache/kde-apps/grantleetheme-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/grantleetheme-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8cb8a6f263128f239f3fb43e86bdb102 diff --git a/metadata/md5-cache/kde-apps/grantleetheme-19.08.1 b/metadata/md5-cache/kde-apps/grantleetheme-19.08.1 index 2ef14c5028f4..49bda6b7607d 100644 --- a/metadata/md5-cache/kde-apps/grantleetheme-19.08.1 +++ b/metadata/md5-cache/kde-apps/grantleetheme-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/grantleetheme-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=54a2ff7d2b250b66669b39aee254cf56 diff --git a/metadata/md5-cache/kde-apps/gwenview-19.04.3 b/metadata/md5-cache/kde-apps/gwenview-19.04.3 index 393fbf449232..2bb4e6aced16 100644 --- a/metadata/md5-cache/kde-apps/gwenview-19.04.3 +++ b/metadata/md5-cache/kde-apps/gwenview-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/gwenview-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c5ab474faa00fdf3ce0877673e2fbb39 diff --git a/metadata/md5-cache/kde-apps/gwenview-19.08.1 b/metadata/md5-cache/kde-apps/gwenview-19.08.1 index 9251c8d07f69..33b5965806e6 100644 --- a/metadata/md5-cache/kde-apps/gwenview-19.08.1 +++ b/metadata/md5-cache/kde-apps/gwenview-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/gwenview-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d376caa04710b2099a40c176cb900974 diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-19.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-19.04.3 index de01500d1e03..ed87ff02fdb4 100644 --- a/metadata/md5-cache/kde-apps/incidenceeditor-19.04.3 +++ b/metadata/md5-cache/kde-apps/incidenceeditor-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-calendar-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/akonadi-mime-19.04.3:5 >=kde-apps/calendarsupport-19.04.3:5 >=kde-apps/eventviews-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kdepim-apps-libs-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/kldap-19.04.3:5 >=kde-apps/kmailtransport-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/incidenceeditor-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ed677cdeaacc937328d4aadd6fc625e0 diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-19.08.1 b/metadata/md5-cache/kde-apps/incidenceeditor-19.08.1 index 6dee9c9411ef..510771d196c1 100644 --- a/metadata/md5-cache/kde-apps/incidenceeditor-19.08.1 +++ b/metadata/md5-cache/kde-apps/incidenceeditor-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-calendar-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/eventviews-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kldap-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/incidenceeditor-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dbe9cd3cc7f8837d9ca15300e6ca76d9 diff --git a/metadata/md5-cache/kde-apps/juk-19.04.3 b/metadata/md5-cache/kde-apps/juk-19.04.3 index d8a4123753c3..4db0fe10b745 100644 --- a/metadata/md5-cache/kde-apps/juk-19.04.3 +++ b/metadata/md5-cache/kde-apps/juk-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/juk-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e842047ff06e671ea3848fdc431c2403 diff --git a/metadata/md5-cache/kde-apps/juk-19.08.1 b/metadata/md5-cache/kde-apps/juk-19.08.1 index 55a5826b013d..378bf40227e0 100644 --- a/metadata/md5-cache/kde-apps/juk-19.08.1 +++ b/metadata/md5-cache/kde-apps/juk-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/juk-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b66c8b2e3eb114ddceeba710905680b8 diff --git a/metadata/md5-cache/kde-apps/k3b-19.04.3 b/metadata/md5-cache/kde-apps/k3b-19.04.3 index d62337b2032a..9e01ecd6052c 100644 --- a/metadata/md5-cache/kde-apps/k3b-19.04.3 +++ b/metadata/md5-cache/kde-apps/k3b-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/k3b-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e773f971640c9aaaebc0a00e79640914 diff --git a/metadata/md5-cache/kde-apps/k3b-19.08.1 b/metadata/md5-cache/kde-apps/k3b-19.08.1 index e38604b760e5..7dfa065c8e63 100644 --- a/metadata/md5-cache/kde-apps/k3b-19.08.1 +++ b/metadata/md5-cache/kde-apps/k3b-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/k3b-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=75c8a9b993f16f2849eb9957519026d9 diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-19.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-19.04.3 index 677383a94e2f..dd252e0f007d 100644 --- a/metadata/md5-cache/kde-apps/kaccounts-integration-19.04.3 +++ b/metadata/md5-cache/kde-apps/kaccounts-integration-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5. RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kaccounts-integration-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=55800bcbdf5da94851fc2f1eddd14165 diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-19.08.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-19.08.1 index b5fd3be3d4fe..6de26eb20583 100644 --- a/metadata/md5-cache/kde-apps/kaccounts-integration-19.08.1 +++ b/metadata/md5-cache/kde-apps/kaccounts-integration-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5. RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kaccounts-integration-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=97ec63e507f556233991e56dfa4f6abe diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-19.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-19.04.3 index c34931addcf6..63a89fd5cbd5 100644 --- a/metadata/md5-cache/kde-apps/kaccounts-providers-19.04.3 +++ b/metadata/md5-cache/kde-apps/kaccounts-providers-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-apps/kaccounts-integration-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kaccounts-providers-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=db39f3a3e9a1b1a10dc6e52337857612 diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-19.08.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-19.08.1 index d90cc3877801..5a8592985490 100644 --- a/metadata/md5-cache/kde-apps/kaccounts-providers-19.08.1 +++ b/metadata/md5-cache/kde-apps/kaccounts-providers-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-apps/kaccounts-integration-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kaccounts-providers-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b6671323fde92538f783fb925d6ee170 diff --git a/metadata/md5-cache/kde-apps/kaddressbook-19.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-19.04.3 index 4660046de642..8b37490c2966 100644 --- a/metadata/md5-cache/kde-apps/kaddressbook-19.04.3 +++ b/metadata/md5-cache/kde-apps/kaddressbook-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/akonadi-search-19.04.3:5 >=kde-apps/grantleetheme-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kdepim-apps-libs-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/libgravatar-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/libkleo-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kaddressbook-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e6e3613423ede1e853f2f7fae0a867cf diff --git a/metadata/md5-cache/kde-apps/kaddressbook-19.08.1 b/metadata/md5-cache/kde-apps/kaddressbook-19.08.1 index 22eca48a8b1f..572fec5196d3 100644 --- a/metadata/md5-cache/kde-apps/kaddressbook-19.08.1 +++ b/metadata/md5-cache/kde-apps/kaddressbook-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-search-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kontactinterface-19.08.1:5 >=kde-apps/libgravatar-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kaddressbook-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=32ea99d4d618f965dde9b629f1719dbb diff --git a/metadata/md5-cache/kde-apps/kajongg-19.04.3 b/metadata/md5-cache/kde-apps/kajongg-19.04.3 index c5083d3031a2..fc3440584f88 100644 --- a/metadata/md5-cache/kde-apps/kajongg-19.04.3 +++ b/metadata/md5-cache/kde-apps/kajongg-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kajongg-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=efd82602d5b1acfdf646de6cdcc95fbd diff --git a/metadata/md5-cache/kde-apps/kajongg-19.08.1 b/metadata/md5-cache/kde-apps/kajongg-19.08.1 index 2bbde4c92a7a..098ac6781642 100644 --- a/metadata/md5-cache/kde-apps/kajongg-19.08.1 +++ b/metadata/md5-cache/kde-apps/kajongg-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kajongg-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9c5386c6575338e88e8f557aeca17155 diff --git a/metadata/md5-cache/kde-apps/kalarm-19.04.3 b/metadata/md5-cache/kde-apps/kalarm-19.04.3 index 409070fef374..f2d75aedd1ea 100644 --- a/metadata/md5-cache/kde-apps/kalarm-19.04.3 +++ b/metadata/md5-cache/kde-apps/kalarm-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/akonadi-mime-19.04.3:5 >=kde-apps/kalarmcal-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kdepim-apps-libs-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/kmailtransport-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/mailcommon-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kalarm-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e25d7b295f801767c9d0c3ba2a2ae9b9 diff --git a/metadata/md5-cache/kde-apps/kalarm-19.08.1 b/metadata/md5-cache/kde-apps/kalarm-19.08.1 index 71262a122c8a..b88ea5294f78 100644 --- a/metadata/md5-cache/kde-apps/kalarm-19.08.1 +++ b/metadata/md5-cache/kde-apps/kalarm-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kalarmcal-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kontactinterface-19.08.1:5 >=kde-apps/kpimtextedit-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kalarm-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3a5a84d9f7fba91db40a3cb41c8bca20 diff --git a/metadata/md5-cache/kde-apps/kalarmcal-19.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-19.04.3 index 1d873929e384..8031f6acf8d5 100644 --- a/metadata/md5-cache/kde-apps/kalarmcal-19.04.3 +++ b/metadata/md5-cache/kde-apps/kalarmcal-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kalarmcal-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=397228c07a9c7a1bb5aef7d8e6e691f1 diff --git a/metadata/md5-cache/kde-apps/kalarmcal-19.08.1 b/metadata/md5-cache/kde-apps/kalarmcal-19.08.1 index e80b0b401c68..f7ed9603e3a4 100644 --- a/metadata/md5-cache/kde-apps/kalarmcal-19.08.1 +++ b/metadata/md5-cache/kde-apps/kalarmcal-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kalarmcal-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4c87c8d579093afce6b96035fb05d28a diff --git a/metadata/md5-cache/kde-apps/kalgebra-19.04.3 b/metadata/md5-cache/kde-apps/kalgebra-19.04.3 index 852f9859bab5..5ee0afbdfee3 100644 --- a/metadata/md5-cache/kde-apps/kalgebra-19.04.3 +++ b/metadata/md5-cache/kde-apps/kalgebra-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/analitza-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kalgebra-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=db292cc415fc4e4844463c448a0bc9d6 diff --git a/metadata/md5-cache/kde-apps/kalgebra-19.08.1 b/metadata/md5-cache/kde-apps/kalgebra-19.08.1 index 82bdaf0cc2a6..e995fbfb58b3 100644 --- a/metadata/md5-cache/kde-apps/kalgebra-19.08.1 +++ b/metadata/md5-cache/kde-apps/kalgebra-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/analitza-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kalgebra-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c21c4a8232c61cec722efb0dfbbd8232 diff --git a/metadata/md5-cache/kde-apps/kalzium-19.04.3 b/metadata/md5-cache/kde-apps/kalzium-19.04.3 index e0b79164465c..ba0e8775d3ac 100644 --- a/metadata/md5-cache/kde-apps/kalzium-19.04.3 +++ b/metadata/md5-cache/kde-apps/kalzium-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editor? ( >=kde-frameworks/knewstuff-5.60.0:5 >=dev-qt/qtopengl-5.12.3:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kalzium-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6aaf306d6759fb56911e5a982d022a56 diff --git a/metadata/md5-cache/kde-apps/kalzium-19.08.1 b/metadata/md5-cache/kde-apps/kalzium-19.08.1 index 852d708b1335..bea2d40bb114 100644 --- a/metadata/md5-cache/kde-apps/kalzium-19.08.1 +++ b/metadata/md5-cache/kde-apps/kalzium-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editor? ( >=kde-frameworks/knewstuff-5.60.0:5 >=dev-qt/qtopengl-5.12.3:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kalzium-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d7748e41caf488557898cf2c99135e8c diff --git a/metadata/md5-cache/kde-apps/kamera-19.04.3 b/metadata/md5-cache/kde-apps/kamera-19.04.3 index 397eececce76..d5096bcdacac 100644 --- a/metadata/md5-cache/kde-apps/kamera-19.04.3 +++ b/metadata/md5-cache/kde-apps/kamera-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kamera-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1e25a901f21b88285b39983f9239c067 diff --git a/metadata/md5-cache/kde-apps/kamera-19.08.1 b/metadata/md5-cache/kde-apps/kamera-19.08.1 index 4b1a777f0b4b..ec47720b643c 100644 --- a/metadata/md5-cache/kde-apps/kamera-19.08.1 +++ b/metadata/md5-cache/kde-apps/kamera-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kamera-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0ba61ae0baeedcc1304bcb2efbbb69f4 diff --git a/metadata/md5-cache/kde-apps/kamoso-19.04.3 b/metadata/md5-cache/kde-apps/kamoso-19.04.3 index 40ce6aba5bd3..6d12500b0bd5 100644 --- a/metadata/md5-cache/kde-apps/kamoso-19.04.3 +++ b/metadata/md5-cache/kde-apps/kamoso-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kamoso-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a42475b9bb8496c841f985691d2f14b6 diff --git a/metadata/md5-cache/kde-apps/kamoso-19.08.1 b/metadata/md5-cache/kde-apps/kamoso-19.08.1 index 458bede33a66..863a84d009e4 100644 --- a/metadata/md5-cache/kde-apps/kamoso-19.08.1 +++ b/metadata/md5-cache/kde-apps/kamoso-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kamoso-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4f071f4f9cff12d569e109df4d1fe51c diff --git a/metadata/md5-cache/kde-apps/kanagram-19.04.3 b/metadata/md5-cache/kde-apps/kanagram-19.04.3 index 170bbd49de8d..54d7cd4aa94e 100644 --- a/metadata/md5-cache/kde-apps/kanagram-19.04.3 +++ b/metadata/md5-cache/kde-apps/kanagram-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-apps/libkeduvocdocument-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/kdeedu-data-19.04.3:5 >=dev-qt/qtmultimedia-5.12.3:5[qml] >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kanagram-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=df757bad3efb1ded070803f441926067 diff --git a/metadata/md5-cache/kde-apps/kanagram-19.08.1 b/metadata/md5-cache/kde-apps/kanagram-19.08.1 index c9bd29011a9b..09ac6914bf10 100644 --- a/metadata/md5-cache/kde-apps/kanagram-19.08.1 +++ b/metadata/md5-cache/kde-apps/kanagram-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-apps/libkeduvocdocument-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/kdeedu-data-19.08.1:5 >=dev-qt/qtmultimedia-5.12.3:5[qml] >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kanagram-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7ce7981acef604607257f4f7314a8975 diff --git a/metadata/md5-cache/kde-apps/kapman-19.04.3 b/metadata/md5-cache/kde-apps/kapman-19.04.3 index bd7e5effabb2..2b2cdade62e4 100644 --- a/metadata/md5-cache/kde-apps/kapman-19.04.3 +++ b/metadata/md5-cache/kde-apps/kapman-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kapman-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6569cdbe6164f02fd867937c9425e3ee diff --git a/metadata/md5-cache/kde-apps/kapman-19.08.1 b/metadata/md5-cache/kde-apps/kapman-19.08.1 index 3dddfb7aefb7..361106402a15 100644 --- a/metadata/md5-cache/kde-apps/kapman-19.08.1 +++ b/metadata/md5-cache/kde-apps/kapman-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kapman-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f9ced0e915c2edb0f560cb6bf1f9e40c diff --git a/metadata/md5-cache/kde-apps/kapptemplate-19.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-19.04.3 index e9a5fb105f89..ae85d823af90 100644 --- a/metadata/md5-cache/kde-apps/kapptemplate-19.04.3 +++ b/metadata/md5-cache/kde-apps/kapptemplate-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kapptemplate-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=26d9ada597acbcd4b0857af082831ef5 diff --git a/metadata/md5-cache/kde-apps/kapptemplate-19.08.1 b/metadata/md5-cache/kde-apps/kapptemplate-19.08.1 index 3ad9a1716e34..42069fc70876 100644 --- a/metadata/md5-cache/kde-apps/kapptemplate-19.08.1 +++ b/metadata/md5-cache/kde-apps/kapptemplate-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kapptemplate-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3dc54ce9f79f66c4ab36b082e56de57c diff --git a/metadata/md5-cache/kde-apps/kate-19.04.3 b/metadata/md5-cache/kde-apps/kate-19.04.3 index a62b4234bb62..327f2ce43bd5 100644 --- a/metadata/md5-cache/kde-apps/kate-19.04.3 +++ b/metadata/md5-cache/kde-apps/kate-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 addons? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtsql-5.12.3:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kate-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=438eba5968d1fb317df7b81c0a3b9fc7 diff --git a/metadata/md5-cache/kde-apps/kate-19.08.1 b/metadata/md5-cache/kde-apps/kate-19.08.1 index 1aaefba298eb..ef689ea47b1a 100644 --- a/metadata/md5-cache/kde-apps/kate-19.08.1 +++ b/metadata/md5-cache/kde-apps/kate-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addons? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtsql-5.12.3:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kate-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1e17b53fb11e795e22bfef6586cf16ce diff --git a/metadata/md5-cache/kde-apps/katomic-19.04.3 b/metadata/md5-cache/kde-apps/katomic-19.04.3 index 5465da1d5755..da1317be6fb3 100644 --- a/metadata/md5-cache/kde-apps/katomic-19.04.3 +++ b/metadata/md5-cache/kde-apps/katomic-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/katomic-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5dd2dd1f88bf6ce60b403d0030a634bd diff --git a/metadata/md5-cache/kde-apps/katomic-19.08.1 b/metadata/md5-cache/kde-apps/katomic-19.08.1 index 9025d467e17b..ddd8304dff33 100644 --- a/metadata/md5-cache/kde-apps/katomic-19.08.1 +++ b/metadata/md5-cache/kde-apps/katomic-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/katomic-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=08e9635033b6996e48ebfa5200c22d08 diff --git a/metadata/md5-cache/kde-apps/kbackup-19.04.3 b/metadata/md5-cache/kde-apps/kbackup-19.04.3 index 7bb14eb62ea2..3f1155e6b0e8 100644 --- a/metadata/md5-cache/kde-apps/kbackup-19.04.3 +++ b/metadata/md5-cache/kde-apps/kbackup-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kbackup-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=65b2569194c278af062eb766b51dbd96 diff --git a/metadata/md5-cache/kde-apps/kbackup-19.08.1 b/metadata/md5-cache/kde-apps/kbackup-19.08.1 index 7b5762aecd47..a2c828ffe2ab 100644 --- a/metadata/md5-cache/kde-apps/kbackup-19.08.1 +++ b/metadata/md5-cache/kde-apps/kbackup-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kbackup-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7a3841b51d214a0199da8bd475c60270 diff --git a/metadata/md5-cache/kde-apps/kblackbox-19.04.3 b/metadata/md5-cache/kde-apps/kblackbox-19.04.3 index 8b340dbda860..2cae12e5a72f 100644 --- a/metadata/md5-cache/kde-apps/kblackbox-19.04.3 +++ b/metadata/md5-cache/kde-apps/kblackbox-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kblackbox-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8d12c6efd1300e6896474bbf54cd26fc diff --git a/metadata/md5-cache/kde-apps/kblackbox-19.08.1 b/metadata/md5-cache/kde-apps/kblackbox-19.08.1 index 0ba3f5ed212c..a31f262d4d5b 100644 --- a/metadata/md5-cache/kde-apps/kblackbox-19.08.1 +++ b/metadata/md5-cache/kde-apps/kblackbox-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kblackbox-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9e0da42a8d60dcb307da0bb2f62fd436 diff --git a/metadata/md5-cache/kde-apps/kblocks-19.04.3 b/metadata/md5-cache/kde-apps/kblocks-19.04.3 index ff82da55c26c..e00ef094f1cc 100644 --- a/metadata/md5-cache/kde-apps/kblocks-19.04.3 +++ b/metadata/md5-cache/kde-apps/kblocks-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kblocks-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=542eadc4002947e28eea658e60891671 diff --git a/metadata/md5-cache/kde-apps/kblocks-19.08.1 b/metadata/md5-cache/kde-apps/kblocks-19.08.1 index 09031f7b3b0f..62945720a14f 100644 --- a/metadata/md5-cache/kde-apps/kblocks-19.08.1 +++ b/metadata/md5-cache/kde-apps/kblocks-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kblocks-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=200cee4f7c9908e68bbd2ad3c1510782 diff --git a/metadata/md5-cache/kde-apps/kblog-19.04.3 b/metadata/md5-cache/kde-apps/kblog-19.04.3 index b70000cf4b71..0caa0e4b6ea2 100644 --- a/metadata/md5-cache/kde-apps/kblog-19.04.3 +++ b/metadata/md5-cache/kde-apps/kblog-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 >=kde-apps/kcalcore-19.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kblog-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=20b1abdcb780305c874f9b75b66dfdc3 diff --git a/metadata/md5-cache/kde-apps/kblog-19.08.1 b/metadata/md5-cache/kde-apps/kblog-19.08.1 index 0ccc536d691b..b530fd0fc7dd 100644 --- a/metadata/md5-cache/kde-apps/kblog-19.08.1 +++ b/metadata/md5-cache/kde-apps/kblog-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 >=kde-apps/kcalcore-19.08.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kblog-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f531ce450c3e77a471451e51e4b618b1 diff --git a/metadata/md5-cache/kde-apps/kbounce-19.04.3 b/metadata/md5-cache/kde-apps/kbounce-19.04.3 index 2471c5666cec..2bfb5678a9d2 100644 --- a/metadata/md5-cache/kde-apps/kbounce-19.04.3 +++ b/metadata/md5-cache/kde-apps/kbounce-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kbounce-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4d677b4f81b73bed592d67a08ad1b206 diff --git a/metadata/md5-cache/kde-apps/kbounce-19.08.1 b/metadata/md5-cache/kde-apps/kbounce-19.08.1 index 2dcc8af540c8..99034eb981a0 100644 --- a/metadata/md5-cache/kde-apps/kbounce-19.08.1 +++ b/metadata/md5-cache/kde-apps/kbounce-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kbounce-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1b23454fc02cf715e17512b9093925fa diff --git a/metadata/md5-cache/kde-apps/kbreakout-19.04.3 b/metadata/md5-cache/kde-apps/kbreakout-19.04.3 index 80b52baa5ee3..07dba12f1781 100644 --- a/metadata/md5-cache/kde-apps/kbreakout-19.04.3 +++ b/metadata/md5-cache/kde-apps/kbreakout-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kbreakout-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e565e120db9b482e9d9f2402426821a7 diff --git a/metadata/md5-cache/kde-apps/kbreakout-19.08.1 b/metadata/md5-cache/kde-apps/kbreakout-19.08.1 index 6332a211048f..a07565a78a82 100644 --- a/metadata/md5-cache/kde-apps/kbreakout-19.08.1 +++ b/metadata/md5-cache/kde-apps/kbreakout-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kbreakout-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a5f49a14610a22f73d2bf4a2e81d8636 diff --git a/metadata/md5-cache/kde-apps/kbruch-19.04.3 b/metadata/md5-cache/kde-apps/kbruch-19.04.3 index f058c513f7b9..e3737cda5475 100644 --- a/metadata/md5-cache/kde-apps/kbruch-19.04.3 +++ b/metadata/md5-cache/kde-apps/kbruch-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kbruch-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d169a4e7eb25bf601873a9812ee38a02 diff --git a/metadata/md5-cache/kde-apps/kbruch-19.08.1 b/metadata/md5-cache/kde-apps/kbruch-19.08.1 index 9c68dc4cbf32..b9bc14f7cc02 100644 --- a/metadata/md5-cache/kde-apps/kbruch-19.08.1 +++ b/metadata/md5-cache/kde-apps/kbruch-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kbruch-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=402e947faadae6ce6686a3a8fd93ee8c diff --git a/metadata/md5-cache/kde-apps/kcachegrind-19.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-19.04.3 index 0c5b2ac346cc..437e35284bb3 100644 --- a/metadata/md5-cache/kde-apps/kcachegrind-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcachegrind-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/graphviz >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcachegrind-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3a306195b0d224d56fa5ffbfa31caa9b diff --git a/metadata/md5-cache/kde-apps/kcachegrind-19.08.1 b/metadata/md5-cache/kde-apps/kcachegrind-19.08.1 index 7970045ec870..e4cb36d4ca2f 100644 --- a/metadata/md5-cache/kde-apps/kcachegrind-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcachegrind-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/graphviz >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcachegrind-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=47ee41c88ef35b535c48df607929567b diff --git a/metadata/md5-cache/kde-apps/kcalc-19.04.3 b/metadata/md5-cache/kde-apps/kcalc-19.04.3 index 484357c1dc10..25e5c8c265e2 100644 --- a/metadata/md5-cache/kde-apps/kcalc-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcalc-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcalc-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8b1401d806f7d8fb2244fec2fedff4cb diff --git a/metadata/md5-cache/kde-apps/kcalc-19.08.1 b/metadata/md5-cache/kde-apps/kcalc-19.08.1 index 44397a4fe0ac..5a00d0e7ea00 100644 --- a/metadata/md5-cache/kde-apps/kcalc-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcalc-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/gmp:0= dev-libs/mpfr:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcalc-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=414fe8a21eb736e2e838c638c7d770ba diff --git a/metadata/md5-cache/kde-apps/kcalcore-19.04.3 b/metadata/md5-cache/kde-apps/kcalcore-19.04.3 index 3333f0d378e2..217c58a08fa0 100644 --- a/metadata/md5-cache/kde-apps/kcalcore-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcalcore-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcalcore-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1d3782a71733f4f42ac797fd519be1b7 diff --git a/metadata/md5-cache/kde-apps/kcalcore-19.08.1 b/metadata/md5-cache/kde-apps/kcalcore-19.08.1 index 5146a4fe054c..dc88e451aa72 100644 --- a/metadata/md5-cache/kde-apps/kcalcore-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcalcore-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcalcore-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ef20895896f6522d1ae95281fe829e20 diff --git a/metadata/md5-cache/kde-apps/kcalutils-19.04.3 b/metadata/md5-cache/kde-apps/kcalutils-19.04.3 index 839bf40857f0..dc935d8370b8 100644 --- a/metadata/md5-cache/kde-apps/kcalutils-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcalutils-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcalutils-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=29d582d15caf08039ee49b6e75785e35 diff --git a/metadata/md5-cache/kde-apps/kcalutils-19.08.1 b/metadata/md5-cache/kde-apps/kcalutils-19.08.1 index fd89f3ac67a9..f9f117d311ae 100644 --- a/metadata/md5-cache/kde-apps/kcalutils-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcalutils-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcalutils-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=30b253a8d0edd8bb6e38a40ae98eeacf diff --git a/metadata/md5-cache/kde-apps/kcharselect-19.04.3 b/metadata/md5-cache/kde-apps/kcharselect-19.04.3 index ba389c9993f3..9b0ff7777094 100644 --- a/metadata/md5-cache/kde-apps/kcharselect-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcharselect-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcharselect-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=865c20165262c2d0d55c332553c86046 diff --git a/metadata/md5-cache/kde-apps/kcharselect-19.08.1 b/metadata/md5-cache/kde-apps/kcharselect-19.08.1 index 6a546156771f..d9075e41f10e 100644 --- a/metadata/md5-cache/kde-apps/kcharselect-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcharselect-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcharselect-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8c07d926ea73cc72273e02eafb926c9a diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-19.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-19.04.3 index a8d9cfb4964f..82fcd3f8f3e5 100644 --- a/metadata/md5-cache/kde-apps/kcolorchooser-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcolorchooser-19.04.3 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcolorchooser-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=10f630331accb94e0cf67882fc55edd8 diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-19.08.1 b/metadata/md5-cache/kde-apps/kcolorchooser-19.08.1 index 209bc75a42f8..0f516bd1db82 100644 --- a/metadata/md5-cache/kde-apps/kcolorchooser-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcolorchooser-19.08.1 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcolorchooser-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=79c2f198e816567af1527e4807be3e60 diff --git a/metadata/md5-cache/kde-apps/kcontacts-19.04.3 b/metadata/md5-cache/kde-apps/kcontacts-19.04.3 index c7a2d29cdc27..977e1014636b 100644 --- a/metadata/md5-cache/kde-apps/kcontacts-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcontacts-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kdepim-l10n app-text/iso-codes >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcontacts-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=38c3f7ca16d5a786b5f6d3f879af43d8 diff --git a/metadata/md5-cache/kde-apps/kcontacts-19.08.1 b/metadata/md5-cache/kde-apps/kcontacts-19.08.1 index 5f0e82d3a430..349b3338bcaa 100644 --- a/metadata/md5-cache/kde-apps/kcontacts-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcontacts-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kdepim-l10n app-text/iso-codes >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcontacts-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=15993e21b5be3add2006143941bd6ce6 diff --git a/metadata/md5-cache/kde-apps/kcron-19.04.3 b/metadata/md5-cache/kde-apps/kcron-19.04.3 index d4419f9ae88b..bd54feb131da 100644 --- a/metadata/md5-cache/kde-apps/kcron-19.04.3 +++ b/metadata/md5-cache/kde-apps/kcron-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kcron-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dcf3dd20c33f582e9621c660e54e87e1 diff --git a/metadata/md5-cache/kde-apps/kcron-19.08.1 b/metadata/md5-cache/kde-apps/kcron-19.08.1 index a493defa0825..f57d679c8517 100644 --- a/metadata/md5-cache/kde-apps/kcron-19.08.1 +++ b/metadata/md5-cache/kde-apps/kcron-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kcron-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=449a259b865279cf1ca599d979bc3e48 diff --git a/metadata/md5-cache/kde-apps/kdav-19.04.3 b/metadata/md5-cache/kde-apps/kdav-19.04.3 index cd6798d6b05b..11572ca50842 100644 --- a/metadata/md5-cache/kde-apps/kdav-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdav-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdav-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cab3cc5e25496d47ac9f7f401fcd619c diff --git a/metadata/md5-cache/kde-apps/kdav-19.08.1 b/metadata/md5-cache/kde-apps/kdav-19.08.1 index bfb9a2da3deb..440f92a88c86 100644 --- a/metadata/md5-cache/kde-apps/kdav-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdav-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdav-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=795441c49021356ca50031c11bf5a824 diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.04.3 index 29102818a151..829b5402dae8 100644 --- a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.04.3 +++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kde-dev-scripts-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8d453556134748e78dc35ccfe9ebd437 diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.08.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.08.1 index 5ab9635052d0..e816de141627 100644 --- a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.08.1 +++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kde-dev-scripts-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8025fc7b3e1438c4177beff401add78e diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-19.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-19.04.3 index 4c8ef1feecc2..a3d88175932c 100644 --- a/metadata/md5-cache/kde-apps/kde-dev-utils-19.04.3 +++ b/metadata/md5-cache/kde-apps/kde-dev-utils-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kde-dev-utils-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=26e037b44f19639781283b22849d32e6 diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-19.08.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-19.08.1 index 67c796951dce..f8ba3aa8a021 100644 --- a/metadata/md5-cache/kde-apps/kde-dev-utils-19.08.1 +++ b/metadata/md5-cache/kde-apps/kde-dev-utils-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kde-dev-utils-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1faa419c28868041c43f97ee3b760ed7 diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-19.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-19.04.3 index d7dac3b200cd..41faad6668f1 100644 --- a/metadata/md5-cache/kde-apps/kdebugsettings-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdebugsettings-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdebugsettings-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a4c2258745db5b14a734f22b55bacff0 diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-19.08.1 b/metadata/md5-cache/kde-apps/kdebugsettings-19.08.1 index 2dcb497c3441..75cd17064d27 100644 --- a/metadata/md5-cache/kde-apps/kdebugsettings-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdebugsettings-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdebugsettings-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4dd51c65e02c52522d8b88b17f7dc7ba diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-19.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-19.04.3 index bba67bc34538..47de3be92439 100644 --- a/metadata/md5-cache/kde-apps/kdeedu-data-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdeedu-data-19.04.3 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=!kde-apps/kde-l10n SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdeedu-data-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=260c4ce4582c13ef54efd42733005468 diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-19.08.1 b/metadata/md5-cache/kde-apps/kdeedu-data-19.08.1 index 576173aa0730..98994c95eb74 100644 --- a/metadata/md5-cache/kde-apps/kdeedu-data-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdeedu-data-19.08.1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=!kde-apps/kde-l10n SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdeedu-data-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=32dd507eddedc0287c6813fdcf2ab2e8 diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.04.3 index 2eb08e038b48..a9b037ea927c 100644 --- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtgui-5.12.3:5 thumbnail? ( >=kde-frameworks/kio-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdegraphics-mobipocket-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7f088a0fab0e2be472fd977232c869c5 diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.08.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.08.1 index 9e2c7078de41..91b85d853827 100644 --- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtgui-5.12.3:5 thumbnail? ( >=kde-frameworks/kio-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdegraphics-mobipocket-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=05fd7b73cb18464301c7ef20f9c31cfd diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.04.3 index 810a4d87e95c..fda09ef8a0ca 100644 --- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdenetwork-filesharing-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e281c83495f3c8ec05b5de5b8f01d4e7 diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.08.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.08.1 index 758a1775e267..97de29504f98 100644 --- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdenetwork-filesharing-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=514a9cce5d3ca196e6f09e6e366e0051 diff --git a/metadata/md5-cache/kde-apps/kdenlive-19.04.3 b/metadata/md5-cache/kde-apps/kdenlive-19.04.3 index 042a507adb2b..b34f6e78880f 100644 --- a/metadata/md5-cache/kde-apps/kdenlive-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdenlive-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdenlive-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=076b39ba49c14ece03447da54f85f6ee diff --git a/metadata/md5-cache/kde-apps/kdenlive-19.08.1 b/metadata/md5-cache/kde-apps/kdenlive-19.08.1 index b3921d93bf9d..07c2d385ddc0 100644 --- a/metadata/md5-cache/kde-apps/kdenlive-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdenlive-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/rttr >=media-libs/mlt-6.16.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.12.3:5 virtual/ffmpeg[encode,sdl,X] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdenlive-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d3b7a4c4bf809ea707bd95409eef3eb8 diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-19.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-19.04.3 index 5527c36f9786..22086e28b433 100644 --- a/metadata/md5-cache/kde-apps/kdepim-addons-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdepim-addons-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdepim-addons-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0f5d46ee59aa962bc7088f6b4fc1dc2d diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1 b/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1 index ca6588877c03..edcca1e88720 100644 --- a/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1 +++ b/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdepim-addons-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5856de8d44b5a3bd27b46e2b4427c158 diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.04.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.04.3 index 5d7c0c056d58..74bfa35cdb9b 100644 --- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/grantleetheme-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/libkleo-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdepim-apps-libs-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=205e7f8634407acb23d2b405aab08e49 diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.08.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.08.1 index f16a151cd29d..9b1a4404c654 100644 --- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdepim-apps-libs-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d259c141d12b91a1e98c316a19243198 diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-19.04.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-19.04.3 index 49dd95016215..9d48022ca2cd 100644 --- a/metadata/md5-cache/kde-apps/kdepim-runtime-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdepim-runtime-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdepim-runtime-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=76def54af6014aae28d47af507954d34 diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-19.08.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-19.08.1 index 823bfcbb1f43..b343156feef3 100644 --- a/metadata/md5-cache/kde-apps/kdepim-runtime-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdepim-runtime-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdepim-runtime-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7b3e4b0e5d38493f3ec1b360adb6aef7 diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.04.3 index e700e9a47b86..fb2c6fdde22d 100644 --- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 dev-lang/perl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdesdk-kioslaves-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=38a9a749faa17597130c53bb10c32617 diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.08.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.08.1 index 9852757ca02f..cff44fcd1c8d 100644 --- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 dev-lang/perl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdesdk-kioslaves-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4f5326e79cd3435d234d48c5d19b98c9 diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.04.3 index 1c5421f2372b..ba6b42d89df5 100644 --- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdesdk-thumbnailers-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c6d00a07c417943ca483315f660b5720 diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.08.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.08.1 index 59562399eecf..653d6f58f346 100644 --- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdesdk-thumbnailers-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5be2e9b716c0814296434512295946d9 diff --git a/metadata/md5-cache/kde-apps/kdf-19.04.3 b/metadata/md5-cache/kde-apps/kdf-19.04.3 index 8c7470c700a5..40589c773d87 100644 --- a/metadata/md5-cache/kde-apps/kdf-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdf-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdf-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4920d25ea4dd4b49bea5a063a659ee82 diff --git a/metadata/md5-cache/kde-apps/kdf-19.08.1 b/metadata/md5-cache/kde-apps/kdf-19.08.1 index 6b948d783517..d87e14309e6e 100644 --- a/metadata/md5-cache/kde-apps/kdf-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdf-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdf-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1fde3884d18ef00ac574f02065f4a2d9 diff --git a/metadata/md5-cache/kde-apps/kdialog-19.04.3 b/metadata/md5-cache/kde-apps/kdialog-19.04.3 index d0c33e2b118b..f8992aaab160 100644 --- a/metadata/md5-cache/kde-apps/kdialog-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdialog-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdialog-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bf5401a603dfc031d414d45c838c0634 diff --git a/metadata/md5-cache/kde-apps/kdialog-19.08.1 b/metadata/md5-cache/kde-apps/kdialog-19.08.1 index 36fca1e6ab6e..6af2a6a83d98 100644 --- a/metadata/md5-cache/kde-apps/kdialog-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdialog-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdialog-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2d86d27bfea83ad468f9d08442e51313 diff --git a/metadata/md5-cache/kde-apps/kdiamond-19.04.3 b/metadata/md5-cache/kde-apps/kdiamond-19.04.3 index 774abef1381c..ec3de3546c2c 100644 --- a/metadata/md5-cache/kde-apps/kdiamond-19.04.3 +++ b/metadata/md5-cache/kde-apps/kdiamond-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdiamond-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5a4d176c11544981ab31a6f93b8e8165 diff --git a/metadata/md5-cache/kde-apps/kdiamond-19.08.1 b/metadata/md5-cache/kde-apps/kdiamond-19.08.1 index 09e8e3267fb5..7146d571f94d 100644 --- a/metadata/md5-cache/kde-apps/kdiamond-19.08.1 +++ b/metadata/md5-cache/kde-apps/kdiamond-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdiamond-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=83789c684785b1379625ad22f245a931 diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-19.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-19.04.3 index 6b4e1b9a437d..1c41c6c74f55 100644 --- a/metadata/md5-cache/kde-apps/keditbookmarks-19.04.3 +++ b/metadata/md5-cache/kde-apps/keditbookmarks-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/keditbookmarks-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6cf2643c7e55f490a55bbeb273fe53d4 diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-19.08.1 b/metadata/md5-cache/kde-apps/keditbookmarks-19.08.1 index 1c9a08fbd5e8..67db552ec80e 100644 --- a/metadata/md5-cache/kde-apps/keditbookmarks-19.08.1 +++ b/metadata/md5-cache/kde-apps/keditbookmarks-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/keditbookmarks-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e58ec81ff46dad04734c53eb2acbed0b diff --git a/metadata/md5-cache/kde-apps/kfind-19.04.3 b/metadata/md5-cache/kde-apps/kfind-19.04.3 index e11c4a3fb701..d9df62593e7c 100644 --- a/metadata/md5-cache/kde-apps/kfind-19.04.3 +++ b/metadata/md5-cache/kde-apps/kfind-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kfind-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ed44d248fbd54f0983dfe8091707e095 diff --git a/metadata/md5-cache/kde-apps/kfind-19.08.1 b/metadata/md5-cache/kde-apps/kfind-19.08.1 index 3960c63af2bc..f87478af8fa9 100644 --- a/metadata/md5-cache/kde-apps/kfind-19.08.1 +++ b/metadata/md5-cache/kde-apps/kfind-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kfind-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5acae747f752fc04cfa38a14cef3b6bc diff --git a/metadata/md5-cache/kde-apps/kfloppy-19.04.3 b/metadata/md5-cache/kde-apps/kfloppy-19.04.3 index 8dc158f3c05d..7c131e5ac85f 100644 --- a/metadata/md5-cache/kde-apps/kfloppy-19.04.3 +++ b/metadata/md5-cache/kde-apps/kfloppy-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kfloppy-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=127efb5c39c3f66d82c70d55ffbe45ca diff --git a/metadata/md5-cache/kde-apps/kfloppy-19.08.1 b/metadata/md5-cache/kde-apps/kfloppy-19.08.1 index 3f71a39efefc..b7596c268f51 100644 --- a/metadata/md5-cache/kde-apps/kfloppy-19.08.1 +++ b/metadata/md5-cache/kde-apps/kfloppy-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kfloppy-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=290dbec5e06f778cda7bbcc2ddeda22e diff --git a/metadata/md5-cache/kde-apps/kfourinline-19.04.3 b/metadata/md5-cache/kde-apps/kfourinline-19.04.3 index 23c5bc9ccbb2..ef09d77382a0 100644 --- a/metadata/md5-cache/kde-apps/kfourinline-19.04.3 +++ b/metadata/md5-cache/kde-apps/kfourinline-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kfourinline-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4191554a8a779804deecc2abb34b4f9b diff --git a/metadata/md5-cache/kde-apps/kfourinline-19.08.1 b/metadata/md5-cache/kde-apps/kfourinline-19.08.1 index aea9b41970e3..cc4eb3e054cc 100644 --- a/metadata/md5-cache/kde-apps/kfourinline-19.08.1 +++ b/metadata/md5-cache/kde-apps/kfourinline-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kfourinline-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a2440ca6fa8e388baba3828f317491a9 diff --git a/metadata/md5-cache/kde-apps/kgeography-19.04.3 b/metadata/md5-cache/kde-apps/kgeography-19.04.3 index 2b100e1a107e..2bd36bb3f6fd 100644 --- a/metadata/md5-cache/kde-apps/kgeography-19.04.3 +++ b/metadata/md5-cache/kde-apps/kgeography-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kgeography-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4fc12af6e769ed00b309c6868020a41c diff --git a/metadata/md5-cache/kde-apps/kgeography-19.08.1 b/metadata/md5-cache/kde-apps/kgeography-19.08.1 index 2c540df05cfc..219369f8ac20 100644 --- a/metadata/md5-cache/kde-apps/kgeography-19.08.1 +++ b/metadata/md5-cache/kde-apps/kgeography-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kgeography-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8071f69c425a245b962a983ac1ea8003 diff --git a/metadata/md5-cache/kde-apps/kget-19.04.3 b/metadata/md5-cache/kde-apps/kget-19.04.3 index c742774ef58a..77ae7a891843 100644 --- a/metadata/md5-cache/kde-apps/kget-19.04.3 +++ b/metadata/md5-cache/kde-apps/kget-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.15.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kget-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=48267001365db39faae31dbd2a789731 diff --git a/metadata/md5-cache/kde-apps/kget-19.08.1 b/metadata/md5-cache/kde-apps/kget-19.08.1 index 50a799ed6845..8ac6e76bea5c 100644 --- a/metadata/md5-cache/kde-apps/kget-19.08.1 +++ b/metadata/md5-cache/kde-apps/kget-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.15.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kget-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=68a6ed6f01726e9c26773fe5c48df869 diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-19.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-19.04.3 index 0053dba657b1..4612ca27fdcc 100644 --- a/metadata/md5-cache/kde-apps/kgoldrunner-19.04.3 +++ b/metadata/md5-cache/kde-apps/kgoldrunner-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kgoldrunner-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2515ab8c7b3846543b0f57a681851ab7 diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-19.08.1 b/metadata/md5-cache/kde-apps/kgoldrunner-19.08.1 index dd2e896ab520..171109204c4b 100644 --- a/metadata/md5-cache/kde-apps/kgoldrunner-19.08.1 +++ b/metadata/md5-cache/kde-apps/kgoldrunner-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kgoldrunner-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cf4dd7a37d58514d0d345eccc9cc54eb diff --git a/metadata/md5-cache/kde-apps/kgpg-19.04.3 b/metadata/md5-cache/kde-apps/kgpg-19.04.3 index 4349c2a4ca14..2dde30aa7cc2 100644 --- a/metadata/md5-cache/kde-apps/kgpg-19.04.3 +++ b/metadata/md5-cache/kde-apps/kgpg-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kgpg-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0973270c88ac1f202054eb709bd63105 diff --git a/metadata/md5-cache/kde-apps/kgpg-19.08.1 b/metadata/md5-cache/kde-apps/kgpg-19.08.1 index b7015def4a4e..1faad859752c 100644 --- a/metadata/md5-cache/kde-apps/kgpg-19.08.1 +++ b/metadata/md5-cache/kde-apps/kgpg-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kgpg-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9feb4537c0046cb9f34681ef741b11e0 diff --git a/metadata/md5-cache/kde-apps/khangman-19.04.3 b/metadata/md5-cache/kde-apps/khangman-19.04.3 index 7ce4ef8b063e..672485e39ed1 100644 --- a/metadata/md5-cache/kde-apps/khangman-19.04.3 +++ b/metadata/md5-cache/kde-apps/khangman-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkeduvocdocument-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-19.04.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/khangman-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=515240fdf9dc7bd2ea44599b9644d4d5 diff --git a/metadata/md5-cache/kde-apps/khangman-19.08.1 b/metadata/md5-cache/kde-apps/khangman-19.08.1 index a5ff7e1f7347..b401c6c8439d 100644 --- a/metadata/md5-cache/kde-apps/khangman-19.08.1 +++ b/metadata/md5-cache/kde-apps/khangman-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkeduvocdocument-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-19.08.1:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/khangman-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f0b0cb5e5d5ada405661e051497fc3ff diff --git a/metadata/md5-cache/kde-apps/khelpcenter-19.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-19.04.3 index c5ad84499cef..328ba97ba6ca 100644 --- a/metadata/md5-cache/kde-apps/khelpcenter-19.04.3 +++ b/metadata/md5-cache/kde-apps/khelpcenter-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdoctools-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/khelpcenter-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2f1f50bd08da91ae9b24870f0051896a diff --git a/metadata/md5-cache/kde-apps/khelpcenter-19.08.1 b/metadata/md5-cache/kde-apps/khelpcenter-19.08.1 index 9feaf4e4c5e0..f06834eb4b25 100644 --- a/metadata/md5-cache/kde-apps/khelpcenter-19.08.1 +++ b/metadata/md5-cache/kde-apps/khelpcenter-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdoctools-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/khelpcenter-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0b6d4910036800a719c4310c96a62696 diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-19.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-19.04.3 index 8191a2508cd3..c65c15cb8586 100644 --- a/metadata/md5-cache/kde-apps/kidentitymanagement-19.04.3 +++ b/metadata/md5-cache/kde-apps/kidentitymanagement-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kidentitymanagement-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9dcd31cc478c47379baca25473dfa1da diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-19.08.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-19.08.1 index a9e893fd83a2..eefd8b81975f 100644 --- a/metadata/md5-cache/kde-apps/kidentitymanagement-19.08.1 +++ b/metadata/md5-cache/kde-apps/kidentitymanagement-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kidentitymanagement-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=eee63a74e9a4128b99462212cdf8a2ac diff --git a/metadata/md5-cache/kde-apps/kig-19.04.3 b/metadata/md5-cache/kde-apps/kig-19.04.3 index 496482836a8a..a8053857add7 100644 --- a/metadata/md5-cache/kde-apps/kig-19.04.3 +++ b/metadata/md5-cache/kde-apps/kig-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/ REQUIRED_USE=python_targets_python2_7 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kig-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d5654d4516961ab14f0682faa3d3ee30 diff --git a/metadata/md5-cache/kde-apps/kig-19.08.1 b/metadata/md5-cache/kde-apps/kig-19.08.1 index 22001a6cbc8d..8422c86945a7 100644 --- a/metadata/md5-cache/kde-apps/kig-19.08.1 +++ b/metadata/md5-cache/kde-apps/kig-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/ REQUIRED_USE=python_targets_python2_7 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kig-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=408e2946b35c3d85ad19d30310580a3a diff --git a/metadata/md5-cache/kde-apps/kigo-19.04.3 b/metadata/md5-cache/kde-apps/kigo-19.04.3 index 08d139b11ae5..e0e79229079e 100644 --- a/metadata/md5-cache/kde-apps/kigo-19.04.3 +++ b/metadata/md5-cache/kde-apps/kigo-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kigo-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=42baae0f352cd49bf2c460529b0e42f2 diff --git a/metadata/md5-cache/kde-apps/kigo-19.08.1 b/metadata/md5-cache/kde-apps/kigo-19.08.1 index 9fb2e67d6ecd..277097704997 100644 --- a/metadata/md5-cache/kde-apps/kigo-19.08.1 +++ b/metadata/md5-cache/kde-apps/kigo-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kigo-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4583a306186efd85c57c0ff5cb07ea25 diff --git a/metadata/md5-cache/kde-apps/killbots-19.04.3 b/metadata/md5-cache/kde-apps/killbots-19.04.3 index bb8273a55c27..633ead7e549e 100644 --- a/metadata/md5-cache/kde-apps/killbots-19.04.3 +++ b/metadata/md5-cache/kde-apps/killbots-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/killbots-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ac71930ac6cb447d1a4ecb83b6a1bd2d diff --git a/metadata/md5-cache/kde-apps/killbots-19.08.1 b/metadata/md5-cache/kde-apps/killbots-19.08.1 index 0ded3abc428f..0312764cbffa 100644 --- a/metadata/md5-cache/kde-apps/killbots-19.08.1 +++ b/metadata/md5-cache/kde-apps/killbots-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/killbots-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=289ebc52c759154009d290bfe2353010 diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-19.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-19.04.3 index 2ac2435aabf1..58877db97f73 100644 --- a/metadata/md5-cache/kde-apps/kimagemapeditor-19.04.3 +++ b/metadata/md5-cache/kde-apps/kimagemapeditor-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kimagemapeditor-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8de1347b14e1252ab145d2983a5df2aa diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-19.08.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-19.08.1 index c58fc0a8d95e..c7683c3ff47f 100644 --- a/metadata/md5-cache/kde-apps/kimagemapeditor-19.08.1 +++ b/metadata/md5-cache/kde-apps/kimagemapeditor-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kimagemapeditor-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=34c5edfca12536313b4c94b921730dd1 diff --git a/metadata/md5-cache/kde-apps/kimap-19.04.3 b/metadata/md5-cache/kde-apps/kimap-19.04.3 index a91e72642022..b9f173ef0be5 100644 --- a/metadata/md5-cache/kde-apps/kimap-19.04.3 +++ b/metadata/md5-cache/kde-apps/kimap-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/kmime-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kimap-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5fc1ed9a31852c4aa56222460cecbd3b diff --git a/metadata/md5-cache/kde-apps/kimap-19.08.1 b/metadata/md5-cache/kde-apps/kimap-19.08.1 index 22b7f68ac37d..ebacea3a8d60 100644 --- a/metadata/md5-cache/kde-apps/kimap-19.08.1 +++ b/metadata/md5-cache/kde-apps/kimap-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kimap-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7367b12919d7d35a620c8c299a24b001 diff --git a/metadata/md5-cache/kde-apps/kio-extras-19.04.3 b/metadata/md5-cache/kde-apps/kio-extras-19.04.3 index f05c714fd64b..4731278eef85 100644 --- a/metadata/md5-cache/kde-apps/kio-extras-19.04.3 +++ b/metadata/md5-cache/kde-apps/kio-extras-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5[bzip2,lzma] >=kde-frameworks/kbookmar RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kio-extras-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3c90d2b618133b6760bd743bff8834e4 diff --git a/metadata/md5-cache/kde-apps/kio-extras-19.08.1 b/metadata/md5-cache/kde-apps/kio-extras-19.08.1 index d04c5d02bccc..eed6f0c31b8b 100644 --- a/metadata/md5-cache/kde-apps/kio-extras-19.08.1 +++ b/metadata/md5-cache/kde-apps/kio-extras-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5[bzip2,lzma] >=kde-frameworks/kbookmar RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kio-extras-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=abc358a26f98e3aec0e8bccfcf701de3 diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-19.08.1 b/metadata/md5-cache/kde-apps/kipi-plugins-19.08.1 index de0b1499c071..cb7c7acb1b86 100644 --- a/metadata/md5-cache/kde-apps/kipi-plugins-19.08.1 +++ b/metadata/md5-cache/kde-apps/kipi-plugins-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkipi-19.08.1:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 flashexport? ( >=kde-frameworks/karchive-5.60.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kipi-plugins-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=44b9057d85ecd11eaba5f1d0ef6f9f87 diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-5.9.1 b/metadata/md5-cache/kde-apps/kipi-plugins-5.9.1 index 8dfe1d112b34..fb0b78ec8016 100644 --- a/metadata/md5-cache/kde-apps/kipi-plugins-5.9.1 +++ b/metadata/md5-cache/kde-apps/kipi-plugins-5.9.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkipi-5.9.1:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 flashexport? ( >=kde-frameworks/karchive-5.60.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kipi-plugins/kipi-plugins-5.9.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6b1a2d19b787f517982e480cb1658f37 diff --git a/metadata/md5-cache/kde-apps/kiriki-19.04.3 b/metadata/md5-cache/kde-apps/kiriki-19.04.3 index 508562e149b4..b42704b3661b 100644 --- a/metadata/md5-cache/kde-apps/kiriki-19.04.3 +++ b/metadata/md5-cache/kde-apps/kiriki-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kiriki-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5199ed1cb5a0c7c92a3539d7c9592545 diff --git a/metadata/md5-cache/kde-apps/kiriki-19.08.1 b/metadata/md5-cache/kde-apps/kiriki-19.08.1 index 5913d15909f3..d97231954556 100644 --- a/metadata/md5-cache/kde-apps/kiriki-19.08.1 +++ b/metadata/md5-cache/kde-apps/kiriki-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kiriki-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3eb99d2f8bd7a0c941e45a8f6508018b diff --git a/metadata/md5-cache/kde-apps/kiten-19.04.3 b/metadata/md5-cache/kde-apps/kiten-19.04.3 index 607ea2e0ce77..a85fcbaf977a 100644 --- a/metadata/md5-cache/kde-apps/kiten-19.04.3 +++ b/metadata/md5-cache/kde-apps/kiten-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-fonts/kanjistrokeorders >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kiten-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1ab91b90f215f1b92ea238621985e9ab diff --git a/metadata/md5-cache/kde-apps/kiten-19.08.1 b/metadata/md5-cache/kde-apps/kiten-19.08.1 index 3c8f34951a50..9c94e6aa67a9 100644 --- a/metadata/md5-cache/kde-apps/kiten-19.08.1 +++ b/metadata/md5-cache/kde-apps/kiten-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-fonts/kanjistrokeorders >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kiten-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0ecdacd9ddd25e6afc459a8fd13631fd diff --git a/metadata/md5-cache/kde-apps/kitinerary-19.04.3 b/metadata/md5-cache/kde-apps/kitinerary-19.04.3 index b84daeb42e19..86eb2d00a5a0 100644 --- a/metadata/md5-cache/kde-apps/kitinerary-19.04.3 +++ b/metadata/md5-cache/kde-apps/kitinerary-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kpkpass-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kitinerary-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=41c069c70c0f92de9a50a0577214c4b6 diff --git a/metadata/md5-cache/kde-apps/kitinerary-19.08.1 b/metadata/md5-cache/kde-apps/kitinerary-19.08.1 index d80911d5b471..31ade55ed2e0 100644 --- a/metadata/md5-cache/kde-apps/kitinerary-19.08.1 +++ b/metadata/md5-cache/kde-apps/kitinerary-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpkpass-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 sys-libs/zlib barcode? ( media-libs/zxing-cpp ) pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kitinerary-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c5b416991aaeca3cde54d36760e01af2 diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-19.04.3 b/metadata/md5-cache/kde-apps/kjumpingcube-19.04.3 index 66f9d511edc2..6698afefbafc 100644 --- a/metadata/md5-cache/kde-apps/kjumpingcube-19.04.3 +++ b/metadata/md5-cache/kde-apps/kjumpingcube-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kjumpingcube-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7da5c1615a328b65943bb5ed879da145 diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-19.08.1 b/metadata/md5-cache/kde-apps/kjumpingcube-19.08.1 index 3cc4d11c7dcf..502bd496572a 100644 --- a/metadata/md5-cache/kde-apps/kjumpingcube-19.08.1 +++ b/metadata/md5-cache/kde-apps/kjumpingcube-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kjumpingcube-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fbb69f657e28a9068a7f22c86036ac6d diff --git a/metadata/md5-cache/kde-apps/kldap-19.04.3 b/metadata/md5-cache/kde-apps/kldap-19.04.3 index e70408e8d016..ff78c6719cd7 100644 --- a/metadata/md5-cache/kde-apps/kldap-19.04.3 +++ b/metadata/md5-cache/kde-apps/kldap-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kldap-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=61ff1e387b3d829ffd0a6bfdf77a9dc8 diff --git a/metadata/md5-cache/kde-apps/kldap-19.08.1 b/metadata/md5-cache/kde-apps/kldap-19.08.1 index df613121e988..46b0259f041b 100644 --- a/metadata/md5-cache/kde-apps/kldap-19.08.1 +++ b/metadata/md5-cache/kde-apps/kldap-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kldap-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bfa70c0129c476207ed8497d2dcdb795 diff --git a/metadata/md5-cache/kde-apps/kleopatra-19.04.3 b/metadata/md5-cache/kde-apps/kleopatra-19.04.3 index 99802d26aec8..fd8a448d0a9d 100644 --- a/metadata/md5-cache/kde-apps/kleopatra-19.04.3 +++ b/metadata/md5-cache/kde-apps/kleopatra-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kleopatra-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3711d26372a080978272b7fb663b1ee1 diff --git a/metadata/md5-cache/kde-apps/kleopatra-19.08.1 b/metadata/md5-cache/kde-apps/kleopatra-19.08.1 index dd5372d2c4af..09a2a9d25b27 100644 --- a/metadata/md5-cache/kde-apps/kleopatra-19.08.1 +++ b/metadata/md5-cache/kde-apps/kleopatra-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kleopatra-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8add35a8442dfc58b75ff33b307b7b30 diff --git a/metadata/md5-cache/kde-apps/klettres-19.04.3 b/metadata/md5-cache/kde-apps/klettres-19.04.3 index 9888bbcbb63b..b3ae5a2fb34e 100644 --- a/metadata/md5-cache/kde-apps/klettres-19.04.3 +++ b/metadata/md5-cache/kde-apps/klettres-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/klettres-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b893b2337f96ef476b5a7829308a0bac diff --git a/metadata/md5-cache/kde-apps/klettres-19.08.1 b/metadata/md5-cache/kde-apps/klettres-19.08.1 index 499e3d291dd5..5c39d69b7097 100644 --- a/metadata/md5-cache/kde-apps/klettres-19.08.1 +++ b/metadata/md5-cache/kde-apps/klettres-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/klettres-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3bf06d2a3a4e6699381f563a3a652ae0 diff --git a/metadata/md5-cache/kde-apps/klickety-19.04.3 b/metadata/md5-cache/kde-apps/klickety-19.04.3 index c0b5ff1c4ab7..774fc40b748b 100644 --- a/metadata/md5-cache/kde-apps/klickety-19.04.3 +++ b/metadata/md5-cache/kde-apps/klickety-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/klickety-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bb5d93534545b8bc5725cbcc4b4d767f diff --git a/metadata/md5-cache/kde-apps/klickety-19.08.1 b/metadata/md5-cache/kde-apps/klickety-19.08.1 index d7873e9a1941..74d7fdf8a7a8 100644 --- a/metadata/md5-cache/kde-apps/klickety-19.08.1 +++ b/metadata/md5-cache/kde-apps/klickety-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/klickety-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=26b53927d813031d254646cbd108e2f7 diff --git a/metadata/md5-cache/kde-apps/klines-19.04.3 b/metadata/md5-cache/kde-apps/klines-19.04.3 index 0611046acbb5..e584f59a08c8 100644 --- a/metadata/md5-cache/kde-apps/klines-19.04.3 +++ b/metadata/md5-cache/kde-apps/klines-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/klines-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=52abfc719b6f864104da947a230c326b diff --git a/metadata/md5-cache/kde-apps/klines-19.08.1 b/metadata/md5-cache/kde-apps/klines-19.08.1 index faec0d4c2cc0..9d897e862459 100644 --- a/metadata/md5-cache/kde-apps/klines-19.08.1 +++ b/metadata/md5-cache/kde-apps/klines-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/klines-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=37cf404ba1bdc441880e79ad5863f2a5 diff --git a/metadata/md5-cache/kde-apps/kmag-19.04.3 b/metadata/md5-cache/kde-apps/kmag-19.04.3 index f237b9bf6ee3..1f1341bf2e58 100644 --- a/metadata/md5-cache/kde-apps/kmag-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmag-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmag-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6f0b96823c734a51317c27c3d103b30f diff --git a/metadata/md5-cache/kde-apps/kmag-19.08.1 b/metadata/md5-cache/kde-apps/kmag-19.08.1 index 2c45624afa9e..d6fc6e3c4c01 100644 --- a/metadata/md5-cache/kde-apps/kmag-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmag-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmag-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0f68f0dccd11ecec309237d320d96070 diff --git a/metadata/md5-cache/kde-apps/kmahjongg-19.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-19.04.3 index baef252c9607..27efed5f9bd4 100644 --- a/metadata/md5-cache/kde-apps/kmahjongg-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmahjongg-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=kde-apps/libkmahjongg-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmahjongg-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a18a11e83055186818d733289c9ab9e6 diff --git a/metadata/md5-cache/kde-apps/kmahjongg-19.08.1 b/metadata/md5-cache/kde-apps/kmahjongg-19.08.1 index 839c655d8a25..f2b9bdc90ebc 100644 --- a/metadata/md5-cache/kde-apps/kmahjongg-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmahjongg-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=kde-apps/libkmahjongg-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmahjongg-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1561a71f9208fe17867494aa46072159 diff --git a/metadata/md5-cache/kde-apps/kmail-19.04.3 b/metadata/md5-cache/kde-apps/kmail-19.04.3 index f6c455dd7316..98f71ab94833 100644 --- a/metadata/md5-cache/kde-apps/kmail-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmail-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmail-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=34dc11645e232ee04bf6680407de2105 diff --git a/metadata/md5-cache/kde-apps/kmail-19.08.1 b/metadata/md5-cache/kde-apps/kmail-19.08.1 index 1353f8b80628..e13b1bd9db86 100644 --- a/metadata/md5-cache/kde-apps/kmail-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmail-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmail-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7e09d109ac4793401e428529c53bba1c diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.04.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.04.3 index 77f37c71d62f..683b7e36ece7 100644 --- a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/kldap-19.04.3:5 >=kde-apps/kmailtransport-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/libkleo-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmail-account-wizard-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fc855fca8d577e40e63b18b87a0db21b diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.08.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.08.1 index b70e22ec7f8c..8ae80738f0e2 100644 --- a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kldap-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmail-account-wizard-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=273d95af912496549887e83d4fd4356c diff --git a/metadata/md5-cache/kde-apps/kmailtransport-19.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-19.04.3 index 8e33c0616770..1ecda709cc1a 100644 --- a/metadata/md5-cache/kde-apps/kmailtransport-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmailtransport-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmailtransport-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3f47b8b6ba8f43ce0cdbc76f057086a6 diff --git a/metadata/md5-cache/kde-apps/kmailtransport-19.08.1 b/metadata/md5-cache/kde-apps/kmailtransport-19.08.1 index efde9a1d8d11..6c10e2a754d3 100644 --- a/metadata/md5-cache/kde-apps/kmailtransport-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmailtransport-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmailtransport-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b38c9f338d8c5595d80a34e553184041 diff --git a/metadata/md5-cache/kde-apps/kmbox-19.04.3 b/metadata/md5-cache/kde-apps/kmbox-19.04.3 index 701a97ef137c..42c49cefd10a 100644 --- a/metadata/md5-cache/kde-apps/kmbox-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmbox-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-apps/kmime-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmbox-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7b7d9743f5d7fbe7e6208b077ab681ed diff --git a/metadata/md5-cache/kde-apps/kmbox-19.08.1 b/metadata/md5-cache/kde-apps/kmbox-19.08.1 index 92f28a29b822..f99de65209ea 100644 --- a/metadata/md5-cache/kde-apps/kmbox-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmbox-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-apps/kmime-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmbox-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4e5e52e9fda4a55b11a3b84405e63595 diff --git a/metadata/md5-cache/kde-apps/kmime-19.04.3 b/metadata/md5-cache/kde-apps/kmime-19.04.3 index c15e78bef355..a6dcef0801bb 100644 --- a/metadata/md5-cache/kde-apps/kmime-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmime-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmime-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=05da6a0c52386751d7675308e1312d55 diff --git a/metadata/md5-cache/kde-apps/kmime-19.08.1 b/metadata/md5-cache/kde-apps/kmime-19.08.1 index 1ccb69ba13fb..507d2a037b00 100644 --- a/metadata/md5-cache/kde-apps/kmime-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmime-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmime-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f511b72a858a106435faa8d73d96e884 diff --git a/metadata/md5-cache/kde-apps/kmines-19.04.3 b/metadata/md5-cache/kde-apps/kmines-19.04.3 index deac0f9ff3c9..87625e17bece 100644 --- a/metadata/md5-cache/kde-apps/kmines-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmines-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmines-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=938b4314533af0991f6f3263bad26587 diff --git a/metadata/md5-cache/kde-apps/kmines-19.08.1 b/metadata/md5-cache/kde-apps/kmines-19.08.1 index f641d8412e1d..0f3d53b2ee11 100644 --- a/metadata/md5-cache/kde-apps/kmines-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmines-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmines-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b2d70eed7c1d08bacacddb1a8429ac49 diff --git a/metadata/md5-cache/kde-apps/kmix-19.04.3 b/metadata/md5-cache/kde-apps/kmix-19.04.3 index c46645303cf9..1f0c63c4713e 100644 --- a/metadata/md5-cache/kde-apps/kmix-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmix-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmix-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e8d74402018782b7cff539a75db8d329 diff --git a/metadata/md5-cache/kde-apps/kmix-19.08.1 b/metadata/md5-cache/kde-apps/kmix-19.08.1 index 1c05eb809c26..92969728e963 100644 --- a/metadata/md5-cache/kde-apps/kmix-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmix-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmix-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f7f230afdea6960fa3a080acdcef23d3 diff --git a/metadata/md5-cache/kde-apps/kmousetool-19.04.3 b/metadata/md5-cache/kde-apps/kmousetool-19.04.3 index 5c4b7458485b..169167002c4d 100644 --- a/metadata/md5-cache/kde-apps/kmousetool-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmousetool-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmousetool-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b17f44fec8daab1bcfe30ddf45e2ba5a diff --git a/metadata/md5-cache/kde-apps/kmousetool-19.08.1 b/metadata/md5-cache/kde-apps/kmousetool-19.08.1 index b88fa566e2d8..5fa5beae14a0 100644 --- a/metadata/md5-cache/kde-apps/kmousetool-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmousetool-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmousetool-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=534765a92aefd7300afe64dfae784991 diff --git a/metadata/md5-cache/kde-apps/kmouth-19.04.3 b/metadata/md5-cache/kde-apps/kmouth-19.04.3 index c85e01ebd81f..bd48d38b8756 100644 --- a/metadata/md5-cache/kde-apps/kmouth-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmouth-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmouth-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ff0c65c037ec6a2de829d38784014a26 diff --git a/metadata/md5-cache/kde-apps/kmouth-19.08.1 b/metadata/md5-cache/kde-apps/kmouth-19.08.1 index f577b13d4ab9..019343210634 100644 --- a/metadata/md5-cache/kde-apps/kmouth-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmouth-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmouth-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b2044178393b581c529d64ac35c79447 diff --git a/metadata/md5-cache/kde-apps/kmplot-19.04.3 b/metadata/md5-cache/kde-apps/kmplot-19.04.3 index 2ad61103b709..60c37524b25d 100644 --- a/metadata/md5-cache/kde-apps/kmplot-19.04.3 +++ b/metadata/md5-cache/kde-apps/kmplot-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kmplot-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6c6defb23cca60c4d4e5e687a73eef3b diff --git a/metadata/md5-cache/kde-apps/kmplot-19.08.1 b/metadata/md5-cache/kde-apps/kmplot-19.08.1 index f84a92d6ee5a..c9fbf294ad78 100644 --- a/metadata/md5-cache/kde-apps/kmplot-19.08.1 +++ b/metadata/md5-cache/kde-apps/kmplot-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kmplot-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e178f7a8bac5a3ea9f82f1796d60b7e9 diff --git a/metadata/md5-cache/kde-apps/knavalbattle-19.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-19.04.3 index 0ee78ec815ee..556de7a94ec5 100644 --- a/metadata/md5-cache/kde-apps/knavalbattle-19.04.3 +++ b/metadata/md5-cache/kde-apps/knavalbattle-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/knavalbattle-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6c53bfa56cb18ba8ed48c6cea537f5fc diff --git a/metadata/md5-cache/kde-apps/knavalbattle-19.08.1 b/metadata/md5-cache/kde-apps/knavalbattle-19.08.1 index 696e9e398710..da5db93a1306 100644 --- a/metadata/md5-cache/kde-apps/knavalbattle-19.08.1 +++ b/metadata/md5-cache/kde-apps/knavalbattle-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/knavalbattle-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=189fb557a8991b95fa662478cc919782 diff --git a/metadata/md5-cache/kde-apps/knetwalk-19.04.3 b/metadata/md5-cache/kde-apps/knetwalk-19.04.3 index a095a0c9f4e0..8bfebbcc624c 100644 --- a/metadata/md5-cache/kde-apps/knetwalk-19.04.3 +++ b/metadata/md5-cache/kde-apps/knetwalk-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/knetwalk-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=391807cd7772d3a3d0fd01bf44673d86 diff --git a/metadata/md5-cache/kde-apps/knetwalk-19.08.1 b/metadata/md5-cache/kde-apps/knetwalk-19.08.1 index 28dd5d49ff9c..f8cf63b30a8f 100644 --- a/metadata/md5-cache/kde-apps/knetwalk-19.08.1 +++ b/metadata/md5-cache/kde-apps/knetwalk-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/knetwalk-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2a3a842434c43f9f89d617f3ddcf1adc diff --git a/metadata/md5-cache/kde-apps/knights-19.04.3 b/metadata/md5-cache/kde-apps/knights-19.04.3 index e17a3f5ca92a..0218df336ee6 100644 --- a/metadata/md5-cache/kde-apps/knights-19.04.3 +++ b/metadata/md5-cache/kde-apps/knights-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/knights-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=81c7d652ec4ffdf10805a904b84100e9 diff --git a/metadata/md5-cache/kde-apps/knights-19.08.1 b/metadata/md5-cache/kde-apps/knights-19.08.1 index 78f6119fec6b..faf3ff31f2ae 100644 --- a/metadata/md5-cache/kde-apps/knights-19.08.1 +++ b/metadata/md5-cache/kde-apps/knights-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/knights-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c9e57e63b17d259cd6bf12f3376e6758 diff --git a/metadata/md5-cache/kde-apps/knotes-19.04.3 b/metadata/md5-cache/kde-apps/knotes-19.04.3 index 64690d06377b..1a9fc43cb651 100644 --- a/metadata/md5-cache/kde-apps/knotes-19.04.3 +++ b/metadata/md5-cache/kde-apps/knotes-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-notes-19.04.3:5 >=kde-apps/akonadi-search-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/knotes-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4140ab3b560a7875ea3707e9c64fd4bf diff --git a/metadata/md5-cache/kde-apps/knotes-19.08.1 b/metadata/md5-cache/kde-apps/knotes-19.08.1 index fe2df5d5c735..45dd3e70f595 100644 --- a/metadata/md5-cache/kde-apps/knotes-19.08.1 +++ b/metadata/md5-cache/kde-apps/knotes-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-notes-19.08.1:5 >=kde-apps/akonadi-search-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kontactinterface-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/knotes-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=802d274064457ff0d34975665497de3a diff --git a/metadata/md5-cache/kde-apps/kolf-19.04.3 b/metadata/md5-cache/kde-apps/kolf-19.04.3 index 13b8ff74d3bc..27a6473e3251 100644 --- a/metadata/md5-cache/kde-apps/kolf-19.04.3 +++ b/metadata/md5-cache/kde-apps/kolf-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kolf-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=66931621621b922c0ca8fffa60257795 diff --git a/metadata/md5-cache/kde-apps/kolf-19.08.1 b/metadata/md5-cache/kde-apps/kolf-19.08.1 index 93fd5d151806..921fea6ddc5c 100644 --- a/metadata/md5-cache/kde-apps/kolf-19.08.1 +++ b/metadata/md5-cache/kde-apps/kolf-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kolf-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1469738892fe0f03ae86c96326bd9a8b diff --git a/metadata/md5-cache/kde-apps/kollision-19.04.3 b/metadata/md5-cache/kde-apps/kollision-19.04.3 index 154b6c403098..94429d75dd50 100644 --- a/metadata/md5-cache/kde-apps/kollision-19.04.3 +++ b/metadata/md5-cache/kde-apps/kollision-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kollision-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=13d97d34dbbbd53eaa04b62b9551167d diff --git a/metadata/md5-cache/kde-apps/kollision-19.08.1 b/metadata/md5-cache/kde-apps/kollision-19.08.1 index 2bb075d07d08..54adab519d7e 100644 --- a/metadata/md5-cache/kde-apps/kollision-19.08.1 +++ b/metadata/md5-cache/kde-apps/kollision-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kollision-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=768d74be8c54ec4bb4bf8fd5234d0098 diff --git a/metadata/md5-cache/kde-apps/kolourpaint-19.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-19.04.3 index ad41bf2c7216..0d11309b02b5 100644 --- a/metadata/md5-cache/kde-apps/kolourpaint-19.04.3 +++ b/metadata/md5-cache/kde-apps/kolourpaint-19.04.3 @@ -10,5 +10,9 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 scanner? ( >=kde-apps/libksane-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kolourpaint-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5d56287d050522a36e3c6b9ed1f0a18d diff --git a/metadata/md5-cache/kde-apps/kolourpaint-19.08.1 b/metadata/md5-cache/kde-apps/kolourpaint-19.08.1 index d11bd520e41e..af2ab5c2ed53 100644 --- a/metadata/md5-cache/kde-apps/kolourpaint-19.08.1 +++ b/metadata/md5-cache/kde-apps/kolourpaint-19.08.1 @@ -10,5 +10,9 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 scanner? ( >=kde-apps/libksane-19.08.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kolourpaint-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cecd57d8ac4d810ea9852cae642aa813 diff --git a/metadata/md5-cache/kde-apps/kompare-19.04.3 b/metadata/md5-cache/kde-apps/kompare-19.04.3 index b9d99a41c317..85640753dff2 100644 --- a/metadata/md5-cache/kde-apps/kompare-19.04.3 +++ b/metadata/md5-cache/kde-apps/kompare-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kompare-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2221e72c14368dc924b33a01a5edaa17 diff --git a/metadata/md5-cache/kde-apps/kompare-19.08.1 b/metadata/md5-cache/kde-apps/kompare-19.08.1 index fe6dcfd94118..9f01fa5162e0 100644 --- a/metadata/md5-cache/kde-apps/kompare-19.08.1 +++ b/metadata/md5-cache/kde-apps/kompare-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkomparediff2-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kompare-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=db558ff90a1f1477ebc65a31147b1756 diff --git a/metadata/md5-cache/kde-apps/konqueror-19.04.3 b/metadata/md5-cache/kde-apps/konqueror-19.04.3 index d9739c4cc281..30cc62540c12 100644 --- a/metadata/md5-cache/kde-apps/konqueror-19.04.3 +++ b/metadata/md5-cache/kde-apps/konqueror-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/konqueror-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cf747a4260accde499e9ede75ffc6919 diff --git a/metadata/md5-cache/kde-apps/konqueror-19.08.1 b/metadata/md5-cache/kde-apps/konqueror-19.08.1 index 1bedf46424f4..2e68f21129f2 100644 --- a/metadata/md5-cache/kde-apps/konqueror-19.08.1 +++ b/metadata/md5-cache/kde-apps/konqueror-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/konqueror-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1108390c30f839e858518ccdc6ebf5d3 diff --git a/metadata/md5-cache/kde-apps/konquest-19.04.3 b/metadata/md5-cache/kde-apps/konquest-19.04.3 index 4e993759063f..347f74a0fb6c 100644 --- a/metadata/md5-cache/kde-apps/konquest-19.04.3 +++ b/metadata/md5-cache/kde-apps/konquest-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/konquest-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a101d81fec48c5f0ae650358bd0b4ecc diff --git a/metadata/md5-cache/kde-apps/konquest-19.08.1 b/metadata/md5-cache/kde-apps/konquest-19.08.1 index eaf613723d13..d3324f64b452 100644 --- a/metadata/md5-cache/kde-apps/konquest-19.08.1 +++ b/metadata/md5-cache/kde-apps/konquest-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/konquest-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d8d28bb3126013e55ce2b0d201e5b461 diff --git a/metadata/md5-cache/kde-apps/konsole-19.04.3 b/metadata/md5-cache/kde-apps/konsole-19.04.3 index 0abd415fa5ee..654d1557a890 100644 --- a/metadata/md5-cache/kde-apps/konsole-19.04.3 +++ b/metadata/md5-cache/kde-apps/konsole-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/konsole-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c0161aee2d64087f408e4828a207daf4 diff --git a/metadata/md5-cache/kde-apps/konsole-19.08.1 b/metadata/md5-cache/kde-apps/konsole-19.08.1 index 673a2b827840..a7b085e8d6b8 100644 --- a/metadata/md5-cache/kde-apps/konsole-19.08.1 +++ b/metadata/md5-cache/kde-apps/konsole-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/konsole-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5e607827da35999ccb2e79f44c6bee2d diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-19.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-19.04.3 index 03a28e59b79e..bdb8da49d171 100644 --- a/metadata/md5-cache/kde-apps/konsolekalendar-19.04.3 +++ b/metadata/md5-cache/kde-apps/konsolekalendar-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-calendar-19.04.3:5 >=kde-apps/calendarsupport-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/akonadi-calendar-tools-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a4820d2945e0adc251afda4903dcfb88 diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-19.08.1 b/metadata/md5-cache/kde-apps/konsolekalendar-19.08.1 index 64ad7625b078..206116ab47cd 100644 --- a/metadata/md5-cache/kde-apps/konsolekalendar-19.08.1 +++ b/metadata/md5-cache/kde-apps/konsolekalendar-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-calendar-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-calendar-tools-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c66e091d7b821706376537394601f8cd diff --git a/metadata/md5-cache/kde-apps/kontact-19.04.3 b/metadata/md5-cache/kde-apps/kontact-19.04.3 index ea4c82a9a397..38e0815d85b1 100644 --- a/metadata/md5-cache/kde-apps/kontact-19.04.3 +++ b/metadata/md5-cache/kde-apps/kontact-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/grantleetheme-19.04.3:5 >=kde-apps/kdepim-apps-libs-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/mailcommon-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kontact-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5cf1b70d62cf2a10393cc0847db12b9a diff --git a/metadata/md5-cache/kde-apps/kontact-19.08.1 b/metadata/md5-cache/kde-apps/kontact-19.08.1 index 4a1a6670236e..34fb411bd5e3 100644 --- a/metadata/md5-cache/kde-apps/kontact-19.08.1 +++ b/metadata/md5-cache/kde-apps/kontact-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kontactinterface-19.08.1:5 >=kde-apps/kpimtextedit-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kontact-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9e1ab5ef738728d53ee7e9399912a256 diff --git a/metadata/md5-cache/kde-apps/kontactinterface-19.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-19.04.3 index 48f03dad67ca..9b42a36539c0 100644 --- a/metadata/md5-cache/kde-apps/kontactinterface-19.04.3 +++ b/metadata/md5-cache/kde-apps/kontactinterface-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kontactinterface-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=682d4c429d43c89fed1bf3c7728bfabb diff --git a/metadata/md5-cache/kde-apps/kontactinterface-19.08.1 b/metadata/md5-cache/kde-apps/kontactinterface-19.08.1 index cdb94864f876..6a94e90f764a 100644 --- a/metadata/md5-cache/kde-apps/kontactinterface-19.08.1 +++ b/metadata/md5-cache/kde-apps/kontactinterface-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kontactinterface-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=86ad78cf1dafe276923a352c2920bf2e diff --git a/metadata/md5-cache/kde-apps/kopete-19.04.3 b/metadata/md5-cache/kde-apps/kopete-19.04.3 index 525ccd95cb35..5530737219d3 100644 --- a/metadata/md5-cache/kde-apps/kopete-19.04.3 +++ b/metadata/md5-cache/kde-apps/kopete-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kopete-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=639d4b11bd2de2994fb221473338d8e1 diff --git a/metadata/md5-cache/kde-apps/kopete-19.08.1 b/metadata/md5-cache/kde-apps/kopete-19.08.1 index f4594f6cc597..f2b425556ca9 100644 --- a/metadata/md5-cache/kde-apps/kopete-19.08.1 +++ b/metadata/md5-cache/kde-apps/kopete-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kopete-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0a44ce5bbdddf63e48f42b06194af442 diff --git a/metadata/md5-cache/kde-apps/korganizer-19.04.3 b/metadata/md5-cache/kde-apps/korganizer-19.04.3 index bcceb0904247..f382112f7adb 100644 --- a/metadata/md5-cache/kde-apps/korganizer-19.04.3 +++ b/metadata/md5-cache/kde-apps/korganizer-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/korganizer-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bdc5eac40f7d0466b98467ce6e3de0e7 diff --git a/metadata/md5-cache/kde-apps/korganizer-19.08.1 b/metadata/md5-cache/kde-apps/korganizer-19.08.1 index ea9c42d3528d..92088937839d 100644 --- a/metadata/md5-cache/kde-apps/korganizer-19.08.1 +++ b/metadata/md5-cache/kde-apps/korganizer-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/korganizer-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=767d6b99d0ab82b7d8560c9ae94e9ce4 diff --git a/metadata/md5-cache/kde-apps/kpat-19.04.3 b/metadata/md5-cache/kde-apps/kpat-19.04.3 index 6b19e6308af8..6638b0c2380b 100644 --- a/metadata/md5-cache/kde-apps/kpat-19.04.3 +++ b/metadata/md5-cache/kde-apps/kpat-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-games/freecell-solver >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kpat-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=211f488602cd99955dfd5ca05acd88d2 diff --git a/metadata/md5-cache/kde-apps/kpat-19.08.1 b/metadata/md5-cache/kde-apps/kpat-19.08.1 index 550ac786412a..9d0a9d67a4f2 100644 --- a/metadata/md5-cache/kde-apps/kpat-19.08.1 +++ b/metadata/md5-cache/kde-apps/kpat-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-games/freecell-solver >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kpat-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6656d7f55ed7f2495117963d372067b6 diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-19.04.3 b/metadata/md5-cache/kde-apps/kpimtextedit-19.04.3 index 7c7257aa51c4..7c3f6d86b27d 100644 --- a/metadata/md5-cache/kde-apps/kpimtextedit-19.04.3 +++ b/metadata/md5-cache/kde-apps/kpimtextedit-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kpimtextedit-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c330ac9dd9c4c26023ec2bf015cde74c diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-19.08.1 b/metadata/md5-cache/kde-apps/kpimtextedit-19.08.1 index afcfedcebc50..e8883fc45aee 100644 --- a/metadata/md5-cache/kde-apps/kpimtextedit-19.08.1 +++ b/metadata/md5-cache/kde-apps/kpimtextedit-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kpimtextedit-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d1cecd34dcf626ea29b06ed79a5e92ca diff --git a/metadata/md5-cache/kde-apps/kpkpass-19.04.3 b/metadata/md5-cache/kde-apps/kpkpass-19.04.3 index 4fb07ef16142..f27f8d029f86 100644 --- a/metadata/md5-cache/kde-apps/kpkpass-19.04.3 +++ b/metadata/md5-cache/kde-apps/kpkpass-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kpkpass-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=699b03e8a90451c2c2898b6a5c552451 diff --git a/metadata/md5-cache/kde-apps/kpkpass-19.08.1 b/metadata/md5-cache/kde-apps/kpkpass-19.08.1 index 397f5e7e7d01..5c43a50e19df 100644 --- a/metadata/md5-cache/kde-apps/kpkpass-19.08.1 +++ b/metadata/md5-cache/kde-apps/kpkpass-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kpkpass-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c4ce0c0d2c19248927f2efc7ad4e38e5 diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-19.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-19.04.3 index 88f44bc646f6..e3db04d478b4 100644 --- a/metadata/md5-cache/kde-apps/kqtquickcharts-19.04.3 +++ b/metadata/md5-cache/kde-apps/kqtquickcharts-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kqtquickcharts-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=982a1ce4a08ad8c6312dc3c2035dd180 diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-19.08.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-19.08.1 index 284ec6ca4b93..50de196e1742 100644 --- a/metadata/md5-cache/kde-apps/kqtquickcharts-19.08.1 +++ b/metadata/md5-cache/kde-apps/kqtquickcharts-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kqtquickcharts-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=29110bf2a5ebe28672bf5d4bb86be465 diff --git a/metadata/md5-cache/kde-apps/krdc-19.04.3 b/metadata/md5-cache/kde-apps/krdc-19.04.3 index abcb7e271b61..585e8ecac0a7 100644 --- a/metadata/md5-cache/kde-apps/krdc-19.04.3 +++ b/metadata/md5-cache/kde-apps/krdc-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/krdc-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e3ed788ec51b1afb1398612555333450 diff --git a/metadata/md5-cache/kde-apps/krdc-19.08.1 b/metadata/md5-cache/kde-apps/krdc-19.08.1 index 6b97239d3e23..12a52ae6bfb0 100644 --- a/metadata/md5-cache/kde-apps/krdc-19.08.1 +++ b/metadata/md5-cache/kde-apps/krdc-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/krdc-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=62c4b653441fae61340a156a7b85f97f diff --git a/metadata/md5-cache/kde-apps/kreversi-19.04.3 b/metadata/md5-cache/kde-apps/kreversi-19.04.3 index 60687bdfd62c..ac282ba9d22b 100644 --- a/metadata/md5-cache/kde-apps/kreversi-19.04.3 +++ b/metadata/md5-cache/kde-apps/kreversi-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kreversi-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d56199f7d300d19057a084ba485bb35c diff --git a/metadata/md5-cache/kde-apps/kreversi-19.08.1 b/metadata/md5-cache/kde-apps/kreversi-19.08.1 index 7d5ccf1ffdd4..50765438127f 100644 --- a/metadata/md5-cache/kde-apps/kreversi-19.08.1 +++ b/metadata/md5-cache/kde-apps/kreversi-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kreversi-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b9e65970af6e876db16ce8c2549b82e5 diff --git a/metadata/md5-cache/kde-apps/krfb-19.04.3 b/metadata/md5-cache/kde-apps/krfb-19.04.3 index 9672c97a33d3..f342f690e2a5 100644 --- a/metadata/md5-cache/kde-apps/krfb-19.04.3 +++ b/metadata/md5-cache/kde-apps/krfb-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/krfb-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=be4c1c7e92f0c08f647964c46e521dbc diff --git a/metadata/md5-cache/kde-apps/krfb-19.08.1 b/metadata/md5-cache/kde-apps/krfb-19.08.1 index ac729fc98cab..cdca8725c193 100644 --- a/metadata/md5-cache/kde-apps/krfb-19.08.1 +++ b/metadata/md5-cache/kde-apps/krfb-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/krfb-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=627458f2f36db9be6a6073ca69b3926b diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3 index 85f20272b189..a5effa909c74 100644 --- a/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3 +++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kross-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidge REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3e87f5e061a76d0299844a9276828f46 diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1 b/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1 index 138c7a2eac85..fedc2f90afd1 100644 --- a/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1 +++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kross-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidge REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9257b1663929db434608b06089f84d9b diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.08.1 b/metadata/md5-cache/kde-apps/kross-interpreters-19.08.1 index 79ee174daa66..bb8b6fe7a66a 100644 --- a/metadata/md5-cache/kde-apps/kross-interpreters-19.08.1 +++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kross-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidge REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kross-interpreters-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b8a8dbe6eacc0ac54a754f4dc9980808 diff --git a/metadata/md5-cache/kde-apps/kruler-19.04.3 b/metadata/md5-cache/kde-apps/kruler-19.04.3 index 7d8aed8cc4c0..ad9cddef7da9 100644 --- a/metadata/md5-cache/kde-apps/kruler-19.04.3 +++ b/metadata/md5-cache/kde-apps/kruler-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kruler-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a06dc61ceee205f36eaea79dd96badd7 diff --git a/metadata/md5-cache/kde-apps/kruler-19.08.1 b/metadata/md5-cache/kde-apps/kruler-19.08.1 index b7e07ef1ace2..9fe90e5d3e82 100644 --- a/metadata/md5-cache/kde-apps/kruler-19.08.1 +++ b/metadata/md5-cache/kde-apps/kruler-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kruler-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=58ef8a8fd0173b26c10427e01527151f diff --git a/metadata/md5-cache/kde-apps/kshisen-19.04.3 b/metadata/md5-cache/kde-apps/kshisen-19.04.3 index ac33f714caf4..e55a933c475e 100644 --- a/metadata/md5-cache/kde-apps/kshisen-19.04.3 +++ b/metadata/md5-cache/kde-apps/kshisen-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=kde-apps/libkmahjongg-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kshisen-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9da1bdab0bdd4e4bbdca8170ed4e2742 diff --git a/metadata/md5-cache/kde-apps/kshisen-19.08.1 b/metadata/md5-cache/kde-apps/kshisen-19.08.1 index 7359dc4ae259..7ec0e655437a 100644 --- a/metadata/md5-cache/kde-apps/kshisen-19.08.1 +++ b/metadata/md5-cache/kde-apps/kshisen-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=kde-apps/libkmahjongg-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kshisen-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=228ca9ea38c24759874f484dfa2de292 diff --git a/metadata/md5-cache/kde-apps/ksirk-19.04.3 b/metadata/md5-cache/kde-apps/ksirk-19.04.3 index ed9aa7025751..d60eacbf32df 100644 --- a/metadata/md5-cache/kde-apps/ksirk-19.04.3 +++ b/metadata/md5-cache/kde-apps/ksirk-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ksirk-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=23d68eebc9e02b9d0ed176bd4db505a7 diff --git a/metadata/md5-cache/kde-apps/ksirk-19.08.1 b/metadata/md5-cache/kde-apps/ksirk-19.08.1 index 904d0baf243e..5738455876f2 100644 --- a/metadata/md5-cache/kde-apps/ksirk-19.08.1 +++ b/metadata/md5-cache/kde-apps/ksirk-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ksirk-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=19e8a091210d4603aefdb9122867caf4 diff --git a/metadata/md5-cache/kde-apps/ksmtp-19.04.3 b/metadata/md5-cache/kde-apps/ksmtp-19.04.3 index ba979387fa87..ddb3c8446b6b 100644 --- a/metadata/md5-cache/kde-apps/ksmtp-19.04.3 +++ b/metadata/md5-cache/kde-apps/ksmtp-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >= RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ksmtp-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=60f5f8c4c2fd3c1330ce3e3a864825ae diff --git a/metadata/md5-cache/kde-apps/ksmtp-19.08.1 b/metadata/md5-cache/kde-apps/ksmtp-19.08.1 index e73425946fef..e7e0cf0d1642 100644 --- a/metadata/md5-cache/kde-apps/ksmtp-19.08.1 +++ b/metadata/md5-cache/kde-apps/ksmtp-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >= RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ksmtp-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=64e5d9395c3b9490676bd131951ea6cd diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-19.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-19.04.3 index c49a04f629f4..07f8c7081edc 100644 --- a/metadata/md5-cache/kde-apps/ksnakeduel-19.04.3 +++ b/metadata/md5-cache/kde-apps/ksnakeduel-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ksnakeduel-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a0ec122e739f6c4f04ca2fc64d98beeb diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-19.08.1 b/metadata/md5-cache/kde-apps/ksnakeduel-19.08.1 index dca3026bc084..dd0eae4809e1 100644 --- a/metadata/md5-cache/kde-apps/ksnakeduel-19.08.1 +++ b/metadata/md5-cache/kde-apps/ksnakeduel-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ksnakeduel-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=93afcd0e5eda47e78e2224c51a70868d diff --git a/metadata/md5-cache/kde-apps/kspaceduel-19.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-19.04.3 index 3d23736c5ee7..7831c6f6929f 100644 --- a/metadata/md5-cache/kde-apps/kspaceduel-19.04.3 +++ b/metadata/md5-cache/kde-apps/kspaceduel-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kspaceduel-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=11fd43ca11c9501bd9c058822eccc527 diff --git a/metadata/md5-cache/kde-apps/kspaceduel-19.08.1 b/metadata/md5-cache/kde-apps/kspaceduel-19.08.1 index d30f748768db..f50a985c9ab9 100644 --- a/metadata/md5-cache/kde-apps/kspaceduel-19.08.1 +++ b/metadata/md5-cache/kde-apps/kspaceduel-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kspaceduel-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=51c4d747db93020fdae87091104c982f diff --git a/metadata/md5-cache/kde-apps/ksquares-19.04.3 b/metadata/md5-cache/kde-apps/ksquares-19.04.3 index b25f8327565f..48e6eeddbd4d 100644 --- a/metadata/md5-cache/kde-apps/ksquares-19.04.3 +++ b/metadata/md5-cache/kde-apps/ksquares-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ksquares-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b6dfc20634426dce3957a8cb796cc9f7 diff --git a/metadata/md5-cache/kde-apps/ksquares-19.08.1 b/metadata/md5-cache/kde-apps/ksquares-19.08.1 index 01477ddaec9d..49f352b480ec 100644 --- a/metadata/md5-cache/kde-apps/ksquares-19.08.1 +++ b/metadata/md5-cache/kde-apps/ksquares-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ksquares-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=346d0ed2ee743df830f076333dd8d313 diff --git a/metadata/md5-cache/kde-apps/ksudoku-19.04.3 b/metadata/md5-cache/kde-apps/ksudoku-19.04.3 index 1e0a912e0194..413daa187c37 100644 --- a/metadata/md5-cache/kde-apps/ksudoku-19.04.3 +++ b/metadata/md5-cache/kde-apps/ksudoku-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/glu ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ksudoku-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a520ca1abcc307be37a5857b6bc6d9a5 diff --git a/metadata/md5-cache/kde-apps/ksudoku-19.08.1 b/metadata/md5-cache/kde-apps/ksudoku-19.08.1 index 9be19110afba..de04decaa514 100644 --- a/metadata/md5-cache/kde-apps/ksudoku-19.08.1 +++ b/metadata/md5-cache/kde-apps/ksudoku-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/glu ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ksudoku-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2aa24ff4e2d23e7aa3a2e72cc3a939d4 diff --git a/metadata/md5-cache/kde-apps/ksystemlog-19.04.3 b/metadata/md5-cache/kde-apps/ksystemlog-19.04.3 index 3aacd8e56e69..c38fa9fd83bb 100644 --- a/metadata/md5-cache/kde-apps/ksystemlog-19.04.3 +++ b/metadata/md5-cache/kde-apps/ksystemlog-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ksystemlog-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=12ea378c0d9e63219eaf81ab379723b2 diff --git a/metadata/md5-cache/kde-apps/ksystemlog-19.08.1 b/metadata/md5-cache/kde-apps/ksystemlog-19.08.1 index e6188b97681e..ae94ea82da3b 100644 --- a/metadata/md5-cache/kde-apps/ksystemlog-19.08.1 +++ b/metadata/md5-cache/kde-apps/ksystemlog-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ksystemlog-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=68a9e909ae1ab8d6956b499acd5e146a diff --git a/metadata/md5-cache/kde-apps/kteatime-19.04.3 b/metadata/md5-cache/kde-apps/kteatime-19.04.3 index 52123208002f..f50fe21a8d31 100644 --- a/metadata/md5-cache/kde-apps/kteatime-19.04.3 +++ b/metadata/md5-cache/kde-apps/kteatime-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kteatime-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ae132eb71812ed21ca773a63bd51621f diff --git a/metadata/md5-cache/kde-apps/kteatime-19.08.1 b/metadata/md5-cache/kde-apps/kteatime-19.08.1 index d36a0950fc13..d21dd5ecd634 100644 --- a/metadata/md5-cache/kde-apps/kteatime-19.08.1 +++ b/metadata/md5-cache/kde-apps/kteatime-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kteatime-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2084b05f6a56a2a0958559ff74cb5c2e diff --git a/metadata/md5-cache/kde-apps/ktimer-19.04.3 b/metadata/md5-cache/kde-apps/ktimer-19.04.3 index 49fd216620ef..b6ce6515fee4 100644 --- a/metadata/md5-cache/kde-apps/ktimer-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktimer-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktimer-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e12eb9e592c18e9ed3781760fad813f5 diff --git a/metadata/md5-cache/kde-apps/ktimer-19.08.1 b/metadata/md5-cache/kde-apps/ktimer-19.08.1 index ba1889118d6b..e9473ef7d0ea 100644 --- a/metadata/md5-cache/kde-apps/ktimer-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktimer-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktimer-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a3b24c40b8a074c7644b8926246efd99 diff --git a/metadata/md5-cache/kde-apps/ktouch-19.04.3 b/metadata/md5-cache/kde-apps/ktouch-19.04.3 index 4558d42b8099..4f125e13a58d 100644 --- a/metadata/md5-cache/kde-apps/ktouch-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktouch-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile >=kde-apps/kqtquickcharts-19.04.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktouch-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aa5a4be3a6ba0fe64ce5f2028aaefa8d diff --git a/metadata/md5-cache/kde-apps/ktouch-19.08.1 b/metadata/md5-cache/kde-apps/ktouch-19.08.1 index 79ba03f88fcd..673c2945afc1 100644 --- a/metadata/md5-cache/kde-apps/ktouch-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktouch-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=kde-apps/kqtquickcharts-19.08.1:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktouch-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=59bf98ab4381e035843eff87066d1470 diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.04.3 index e07a34b6c026..cedc8c02660b 100644 --- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/kaccounts-integration-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-19.04.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-accounts-kcm-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=348c7f16463db106c7de687237223f25 diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.08.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.08.1 index f18d43264d43..2d2f4d40bb98 100644 --- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/kaccounts-integration-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-19.08.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-accounts-kcm-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f78443aaebf0605203ebd49eef89a13d diff --git a/metadata/md5-cache/kde-apps/ktp-approver-19.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-19.04.3 index cbcaf075f55b..0445e7ce88c1 100644 --- a/metadata/md5-cache/kde-apps/ktp-approver-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-approver-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-approver-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f40638a103758c301b52a378ef0d0018 diff --git a/metadata/md5-cache/kde-apps/ktp-approver-19.08.1 b/metadata/md5-cache/kde-apps/ktp-approver-19.08.1 index 740b9abd2503..3137530ec81f 100644 --- a/metadata/md5-cache/kde-apps/ktp-approver-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-approver-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-approver-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8cd79f53e18b890362df177fcf9c9a5f diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.04.3 index 6dbc0005dbbc..e73efc371664 100644 --- a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/kaccounts-integration-19.04.3:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-auth-handler-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=07037305bb8b953bd87400d4d0323485 diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.08.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.08.1 index 222e9c25e95e..4c919c1e3297 100644 --- a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/kaccounts-integration-19.08.1:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-auth-handler-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=88e18e6079bd5f17eb4361565a36074c diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-19.04.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-19.04.3 index c092399e7ce0..6ba8a591bad3 100644 --- a/metadata/md5-cache/kde-apps/ktp-call-ui-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-call-ui-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-call-ui-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8d716d93afff8e360f6ae42bb4ea7697 diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-19.08.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-19.08.1 index fbae587a6ffc..270c0e4a16cc 100644 --- a/metadata/md5-cache/kde-apps/ktp-call-ui-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-call-ui-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-call-ui-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=03d81102f45340f45fffdd89f1a3d5dd diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-19.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-19.04.3 index 4b7737ef63d2..4891795584ba 100644 --- a/metadata/md5-cache/kde-apps/ktp-common-internals-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-common-internals-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-common-internals-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3e018a1eb714b5b9e24d69299c6c265a diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-19.08.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-19.08.1 index e01ae50ba712..56d6b6110cfd 100644 --- a/metadata/md5-cache/kde-apps/ktp-common-internals-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-common-internals-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-19.08.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-common-internals-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b50c085d96615218d1db3ecd3957bb29 diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-19.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-19.04.3 index 9fe50da62f47..8cc62d93361a 100644 --- a/metadata/md5-cache/kde-apps/ktp-contact-list-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-contact-list-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-contact-list-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=020c7e30e486de64b74e65b42c95a634 diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-19.08.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-19.08.1 index 0a94c004b6eb..9c2a6a251334 100644 --- a/metadata/md5-cache/kde-apps/ktp-contact-list-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-contact-list-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-contact-list-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=eadf867e38c55b20f2a3e719e53db468 diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.04.3 index d3783fc9aef3..99db011de24f 100644 --- a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-contact-runner-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=617636da87310f25fd74e80caf4d06ff diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.08.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.08.1 index fd8eba564ffa..bb3e6ad28c7f 100644 --- a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-contact-runner-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cb105b791d9930ebb077c3b00b1aba42 diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.04.3 index fa662e8063d3..ab73c1bfd034 100644 --- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.04.3 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-desktop-applets-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ff2a1fc0d5731a98121b7e670496e183 diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.08.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.08.1 index d0bd603fb584..f83e22d6d9c8 100644 --- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.08.1 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-desktop-applets-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=56fb1ba42bb86eb07b1a70a95db56d70 diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.04.3 index 5a4e00c95a3b..12fff4317113 100644 --- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-filetransfer-handler-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=74f8dbb793fcc3eef8368f56909e3178 diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.08.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.08.1 index 19a2ae08d10c..5c8b24fc153b 100644 --- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-filetransfer-handler-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d03a8388d3c22410cb47e8fa9ee8188f diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-19.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-19.04.3 index 8392c599f3b1..c075f2755432 100644 --- a/metadata/md5-cache/kde-apps/ktp-kded-module-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-kded-module-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-kded-module-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=429ecaa8c687972364212142347c73b3 diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-19.08.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-19.08.1 index 5be05225d04e..c916946320d7 100644 --- a/metadata/md5-cache/kde-apps/ktp-kded-module-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-kded-module-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-kded-module-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f63b67ed318b0d3ee365706839996c98 diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-19.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-19.04.3 index 1c3c8c075145..91eb5c58a8f4 100644 --- a/metadata/md5-cache/kde-apps/ktp-send-file-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-send-file-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.04.3:5 >=kde-apps/ktp-filetransfer-handler-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-send-file-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=03daed4d1058877438805f92a4810409 diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-19.08.1 b/metadata/md5-cache/kde-apps/ktp-send-file-19.08.1 index 8cd69ef818a0..f58163472c04 100644 --- a/metadata/md5-cache/kde-apps/ktp-send-file-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-send-file-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.08.1:5 >=kde-apps/ktp-filetransfer-handler-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-send-file-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=72a701f65d600de310956f0c4a009dc7 diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-19.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-19.04.3 index 6bebe810e9bd..7d6c2993448c 100644 --- a/metadata/md5-cache/kde-apps/ktp-text-ui-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktp-text-ui-19.04.3 @@ -10,5 +10,9 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-apps/ktp-common-internals-19.04.3:5[otr] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/ktp-contact-list-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktp-text-ui-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=53a030a430123d1874c784acbf731a71 diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-19.08.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-19.08.1 index 97779fbb83bc..95245d40f178 100644 --- a/metadata/md5-cache/kde-apps/ktp-text-ui-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktp-text-ui-19.08.1 @@ -10,5 +10,9 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-apps/ktp-common-internals-19.08.1:5[otr] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/ktp-contact-list-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktp-text-ui-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6a701a7c3b0fe30ef988e68019ee9820 diff --git a/metadata/md5-cache/kde-apps/ktuberling-19.04.3 b/metadata/md5-cache/kde-apps/ktuberling-19.04.3 index 5fc315db557c..aebba52663fe 100644 --- a/metadata/md5-cache/kde-apps/ktuberling-19.04.3 +++ b/metadata/md5-cache/kde-apps/ktuberling-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktuberling-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=44a139debb9ffd1260cf1bfe0207ea64 diff --git a/metadata/md5-cache/kde-apps/ktuberling-19.08.1 b/metadata/md5-cache/kde-apps/ktuberling-19.08.1 index 0a68ef70da62..65cc44706ca7 100644 --- a/metadata/md5-cache/kde-apps/ktuberling-19.08.1 +++ b/metadata/md5-cache/kde-apps/ktuberling-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktuberling-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=281889cafff4ad224bc4155899ab451a diff --git a/metadata/md5-cache/kde-apps/kturtle-19.04.3 b/metadata/md5-cache/kde-apps/kturtle-19.04.3 index 4419c9ed2845..5a35e4f2945c 100644 --- a/metadata/md5-cache/kde-apps/kturtle-19.04.3 +++ b/metadata/md5-cache/kde-apps/kturtle-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kturtle-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8321d987598dd2a5aa69247c2775c8be diff --git a/metadata/md5-cache/kde-apps/kturtle-19.08.1 b/metadata/md5-cache/kde-apps/kturtle-19.08.1 index fb9ecda5d304..12fd67863c1d 100644 --- a/metadata/md5-cache/kde-apps/kturtle-19.08.1 +++ b/metadata/md5-cache/kde-apps/kturtle-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kturtle-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=00fd9ed4bb3a82a2ca142b80d2040cb0 diff --git a/metadata/md5-cache/kde-apps/kubrick-19.04.3 b/metadata/md5-cache/kde-apps/kubrick-19.04.3 index a93f05287ab7..206213e2e83b 100644 --- a/metadata/md5-cache/kde-apps/kubrick-19.04.3 +++ b/metadata/md5-cache/kde-apps/kubrick-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/glu virtual/opengl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kubrick-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=091255fc1e68571094ceb4b96274624f diff --git a/metadata/md5-cache/kde-apps/kubrick-19.08.1 b/metadata/md5-cache/kde-apps/kubrick-19.08.1 index 050b141a81c4..833cb1aec7f7 100644 --- a/metadata/md5-cache/kde-apps/kubrick-19.08.1 +++ b/metadata/md5-cache/kde-apps/kubrick-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/glu virtual/opengl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kubrick-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d24d651645af3b8f0d80ddaf34bce04f diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-19.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-19.04.3 index 465d7832855d..42958fb9582d 100644 --- a/metadata/md5-cache/kde-apps/kwalletmanager-19.04.3 +++ b/metadata/md5-cache/kde-apps/kwalletmanager-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kwalletmanager-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=15100b8d03bf8336300902e8d177bc5a diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-19.08.1 b/metadata/md5-cache/kde-apps/kwalletmanager-19.08.1 index 4739b37bf2c0..7371dba146bc 100644 --- a/metadata/md5-cache/kde-apps/kwalletmanager-19.08.1 +++ b/metadata/md5-cache/kde-apps/kwalletmanager-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kwalletmanager-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=167cb1e326726ebcaf43bd97b98af252 diff --git a/metadata/md5-cache/kde-apps/kwave-19.04.3 b/metadata/md5-cache/kde-apps/kwave-19.04.3 index 8782e74947be..560219645395 100644 --- a/metadata/md5-cache/kde-apps/kwave-19.04.3 +++ b/metadata/md5-cache/kde-apps/kwave-19.04.3 @@ -10,5 +10,9 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kwave-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9ac775fd11b391a5634c031b58059a6b diff --git a/metadata/md5-cache/kde-apps/kwave-19.08.1 b/metadata/md5-cache/kde-apps/kwave-19.08.1 index b09a40d2ae23..3214fd0a221f 100644 --- a/metadata/md5-cache/kde-apps/kwave-19.08.1 +++ b/metadata/md5-cache/kde-apps/kwave-19.08.1 @@ -10,5 +10,9 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kwave-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e1abf0b09314c5963c86d7315db6e546 diff --git a/metadata/md5-cache/kde-apps/kwordquiz-19.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-19.04.3 index a1f31e02e1f2..7770643eeb1e 100644 --- a/metadata/md5-cache/kde-apps/kwordquiz-19.04.3 +++ b/metadata/md5-cache/kde-apps/kwordquiz-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkeduvocdocument-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kwordquiz-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4170387a3b298435787f8ed6b582a063 diff --git a/metadata/md5-cache/kde-apps/kwordquiz-19.08.1 b/metadata/md5-cache/kde-apps/kwordquiz-19.08.1 index f17bc690559d..a0040c32b3fa 100644 --- a/metadata/md5-cache/kde-apps/kwordquiz-19.08.1 +++ b/metadata/md5-cache/kde-apps/kwordquiz-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkeduvocdocument-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kwordquiz-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f41d3e2f2b93537b08cacf8a849f24eb diff --git a/metadata/md5-cache/kde-apps/kwrite-19.04.3 b/metadata/md5-cache/kde-apps/kwrite-19.04.3 index 1e40fc01df45..71cc5b890e54 100644 --- a/metadata/md5-cache/kde-apps/kwrite-19.04.3 +++ b/metadata/md5-cache/kde-apps/kwrite-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kate-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=45900caab2ddd00add25c92094c11f0d diff --git a/metadata/md5-cache/kde-apps/kwrite-19.08.1 b/metadata/md5-cache/kde-apps/kwrite-19.08.1 index 512fed2d24e4..4bcf3b90bf02 100644 --- a/metadata/md5-cache/kde-apps/kwrite-19.08.1 +++ b/metadata/md5-cache/kde-apps/kwrite-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kate-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=08c989016aa41850881777dc8ee0f30d diff --git a/metadata/md5-cache/kde-apps/libgravatar-19.04.3 b/metadata/md5-cache/kde-apps/libgravatar-19.04.3 index d1c173456aff..83aca726e3bc 100644 --- a/metadata/md5-cache/kde-apps/libgravatar-19.04.3 +++ b/metadata/md5-cache/kde-apps/libgravatar-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libgravatar-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=512cb27abe47cd9546714910c842a1e7 diff --git a/metadata/md5-cache/kde-apps/libgravatar-19.08.1 b/metadata/md5-cache/kde-apps/libgravatar-19.08.1 index 54d03ceb6d67..86690bef8ef2 100644 --- a/metadata/md5-cache/kde-apps/libgravatar-19.08.1 +++ b/metadata/md5-cache/kde-apps/libgravatar-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libgravatar-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3edd71f132efcf4e4b2dcd42813a698e diff --git a/metadata/md5-cache/kde-apps/libkcddb-19.04.3 b/metadata/md5-cache/kde-apps/libkcddb-19.04.3 index 790c3759d66a..51bfcb3b627a 100644 --- a/metadata/md5-cache/kde-apps/libkcddb-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkcddb-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kd RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkcddb-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=32f02689e315d08cbcec4a9990a0988d diff --git a/metadata/md5-cache/kde-apps/libkcddb-19.08.1 b/metadata/md5-cache/kde-apps/libkcddb-19.08.1 index bac9682965f8..d691f75bffa0 100644 --- a/metadata/md5-cache/kde-apps/libkcddb-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkcddb-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kd RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkcddb-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=89072b8cb2bcb9b7e5606420a3748eac diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-19.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-19.04.3 index 2acd924c9529..069e5df79dd5 100644 --- a/metadata/md5-cache/kde-apps/libkcompactdisc-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkcompactdisc-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkcompactdisc-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c7ec86dd00fb36066a1a3085540524a5 diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-19.08.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-19.08.1 index 158b861e6467..b33238966e46 100644 --- a/metadata/md5-cache/kde-apps/libkcompactdisc-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkcompactdisc-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkcompactdisc-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b03fedf0c2261fa5cbf9ddd973819518 diff --git a/metadata/md5-cache/kde-apps/libkdcraw-19.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-19.04.3 index 1eb400c0ab5f..bdaa995d1dd8 100644 --- a/metadata/md5-cache/kde-apps/libkdcraw-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkdcraw-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkdcraw-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3f9642de5736970fd533ec60ce84361e diff --git a/metadata/md5-cache/kde-apps/libkdcraw-19.08.1 b/metadata/md5-cache/kde-apps/libkdcraw-19.08.1 index ba15d21886f8..445399b7f4ef 100644 --- a/metadata/md5-cache/kde-apps/libkdcraw-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkdcraw-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkdcraw-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1227576a359baaad1636e8cb87203479 diff --git a/metadata/md5-cache/kde-apps/libkdegames-19.04.3 b/metadata/md5-cache/kde-apps/libkdegames-19.04.3 index ac33cf79937e..ff408ea23158 100644 --- a/metadata/md5-cache/kde-apps/libkdegames-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkdegames-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkdegames-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f789a59631bfd1b48cd04f3ce62a3f88 diff --git a/metadata/md5-cache/kde-apps/libkdegames-19.08.1 b/metadata/md5-cache/kde-apps/libkdegames-19.08.1 index bd498d992d9e..bc81bbe2e2bf 100644 --- a/metadata/md5-cache/kde-apps/libkdegames-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkdegames-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkdegames-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a5c79c405928db60754bdff7f39f426f diff --git a/metadata/md5-cache/kde-apps/libkdepim-19.04.3 b/metadata/md5-cache/kde-apps/libkdepim-19.04.3 index 910c970e5c37..ac3a6ebc437a 100644 --- a/metadata/md5-cache/kde-apps/libkdepim-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkdepim-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/akonadi-search-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kldap-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkdepim-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e4847d898a8ce6395e8a4c9fca4009db diff --git a/metadata/md5-cache/kde-apps/libkdepim-19.08.1 b/metadata/md5-cache/kde-apps/libkdepim-19.08.1 index 3f11bbc2a3cc..263291c7d73b 100644 --- a/metadata/md5-cache/kde-apps/libkdepim-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkdepim-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-search-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kldap-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkdepim-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=832baf02771c1d5c266bc87b50792cdf diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.04.3 index dbb9bc85c86c..4360dcdad704 100644 --- a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkeduvocdocument-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0cae3192d957ab6a567d2682f9b8a619 diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.08.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.08.1 index 362ef5b80f7f..48c723ff6ec1 100644 --- a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkeduvocdocument-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=241a47aaeebd6d875c0d2281c450c1c7 diff --git a/metadata/md5-cache/kde-apps/libkexiv2-19.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-19.04.3 index 5fb90f761ba4..25eb8541cd12 100644 --- a/metadata/md5-cache/kde-apps/libkexiv2-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkexiv2-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkexiv2-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=927226fd1fe4ad7df5e0e7916c21e1e4 diff --git a/metadata/md5-cache/kde-apps/libkexiv2-19.08.1 b/metadata/md5-cache/kde-apps/libkexiv2-19.08.1 index 84206f592c90..cd1f94efbae9 100644 --- a/metadata/md5-cache/kde-apps/libkexiv2-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkexiv2-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkexiv2-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6570875768108d4d9f1e69d1a6c6e5c7 diff --git a/metadata/md5-cache/kde-apps/libkgapi-19.04.3 b/metadata/md5-cache/kde-apps/libkgapi-19.04.3 index 115be5497238..775b9fa07783 100644 --- a/metadata/md5-cache/kde-apps/libkgapi-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkgapi-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkgapi-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=33f563d25d0e36a2cdacb90ad4c53b29 diff --git a/metadata/md5-cache/kde-apps/libkgapi-19.08.1 b/metadata/md5-cache/kde-apps/libkgapi-19.08.1 index 992c6b31b2a4..5e1f4f13d104 100644 --- a/metadata/md5-cache/kde-apps/libkgapi-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkgapi-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkgapi-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=37dc02df0835ce120597dc6b8dc455fb diff --git a/metadata/md5-cache/kde-apps/libkgeomap-19.04.3 b/metadata/md5-cache/kde-apps/libkgeomap-19.04.3 index b6a7e846f8af..656613f5d763 100644 --- a/metadata/md5-cache/kde-apps/libkgeomap-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkgeomap-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/marble-19.04.3:5=[kde] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkgeomap-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=53813dc66bd2d791da17fb6c723a7ee9 diff --git a/metadata/md5-cache/kde-apps/libkgeomap-19.08.1 b/metadata/md5-cache/kde-apps/libkgeomap-19.08.1 index b09eaaf4d0c5..4a4a3c4ef962 100644 --- a/metadata/md5-cache/kde-apps/libkgeomap-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkgeomap-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-apps/marble-19.08.1:5=[kde] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkgeomap-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2ddbd03195197ae02bf43287af6898da diff --git a/metadata/md5-cache/kde-apps/libkipi-19.04.3 b/metadata/md5-cache/kde-apps/libkipi-19.04.3 index ebed27cf8db6..0d0aec020592 100644 --- a/metadata/md5-cache/kde-apps/libkipi-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkipi-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/32 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkipi-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=956d1441a8f9be72bb07e29ece59a493 diff --git a/metadata/md5-cache/kde-apps/libkipi-19.08.1 b/metadata/md5-cache/kde-apps/libkipi-19.08.1 index 62c742cec945..e2b19b4eeab6 100644 --- a/metadata/md5-cache/kde-apps/libkipi-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkipi-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/32 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkipi-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6b1a198345d5a9dfc9ff978129c1d5df diff --git a/metadata/md5-cache/kde-apps/libkleo-19.04.3 b/metadata/md5-cache/kde-apps/libkleo-19.04.3 index 8433499a55bc..0a159272b8cf 100644 --- a/metadata/md5-cache/kde-apps/libkleo-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkleo-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] fancyviewer? ( >=kde-apps/kpimtextedit-19.04.3:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkleo-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=538118775091e992903330a0934c655a diff --git a/metadata/md5-cache/kde-apps/libkleo-19.08.1 b/metadata/md5-cache/kde-apps/libkleo-19.08.1 index d11f80827eb7..9a09c2e21a77 100644 --- a/metadata/md5-cache/kde-apps/libkleo-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkleo-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] fancyviewer? ( >=kde-apps/kpimtextedit-19.08.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkleo-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2794c85d794407f0f5b076900307c0cc diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-19.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-19.04.3 index fb0a818b7419..1e5a115bb288 100644 --- a/metadata/md5-cache/kde-apps/libkmahjongg-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkmahjongg-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkmahjongg-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b4c84b62b0b4d505a2994847b123443f diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-19.08.1 b/metadata/md5-cache/kde-apps/libkmahjongg-19.08.1 index 707631794ae3..d3bf1ab09026 100644 --- a/metadata/md5-cache/kde-apps/libkmahjongg-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkmahjongg-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkmahjongg-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=48554859fec738eeff4681772c265385 diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-19.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-19.04.3 index 9e013c267374..a53324805212 100644 --- a/metadata/md5-cache/kde-apps/libkomparediff2-19.04.3 +++ b/metadata/md5-cache/kde-apps/libkomparediff2-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libkomparediff2-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=28ec7edf6ff43a89718ffa13e1188b0f diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-19.08.1 b/metadata/md5-cache/kde-apps/libkomparediff2-19.08.1 index 335e7bca704d..5f8c704383d0 100644 --- a/metadata/md5-cache/kde-apps/libkomparediff2-19.08.1 +++ b/metadata/md5-cache/kde-apps/libkomparediff2-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libkomparediff2-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=92cfb96f70c3555c1533dd083358145e diff --git a/metadata/md5-cache/kde-apps/libksane-19.04.3 b/metadata/md5-cache/kde-apps/libksane-19.04.3 index d3720a243400..a6279741556b 100644 --- a/metadata/md5-cache/kde-apps/libksane-19.04.3 +++ b/metadata/md5-cache/kde-apps/libksane-19.04.3 @@ -10,5 +10,9 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libksane-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=64989294299e4d79003838cb6adfad45 diff --git a/metadata/md5-cache/kde-apps/libksane-19.08.1 b/metadata/md5-cache/kde-apps/libksane-19.08.1 index fedf3f122282..3cab01b0d842 100644 --- a/metadata/md5-cache/kde-apps/libksane-19.08.1 +++ b/metadata/md5-cache/kde-apps/libksane-19.08.1 @@ -10,5 +10,9 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libksane-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b17ba5b05a947f8d370271255fbece3d diff --git a/metadata/md5-cache/kde-apps/libksieve-19.04.3 b/metadata/md5-cache/kde-apps/libksieve-19.04.3 index 690396eceffb..9e59b83c643b 100644 --- a/metadata/md5-cache/kde-apps/libksieve-19.04.3 +++ b/metadata/md5-cache/kde-apps/libksieve-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/libksieve-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=37cd2d0a40e9debdf2902f2f09551e7b diff --git a/metadata/md5-cache/kde-apps/libksieve-19.08.1 b/metadata/md5-cache/kde-apps/libksieve-19.08.1 index f18ee3d16053..47fb1f6fb531 100644 --- a/metadata/md5-cache/kde-apps/libksieve-19.08.1 +++ b/metadata/md5-cache/kde-apps/libksieve-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/libksieve-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ccbba9b3a5191390cc5d1fee049ca1f5 diff --git a/metadata/md5-cache/kde-apps/libktnef-19.04.3 b/metadata/md5-cache/kde-apps/libktnef-19.04.3 index d675b80e1a38..45fdba99adf4 100644 --- a/metadata/md5-cache/kde-apps/libktnef-19.04.3 +++ b/metadata/md5-cache/kde-apps/libktnef-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcalutils-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/ktnef-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a3b99d9ce8b415b52ca9540964e5a8b6 diff --git a/metadata/md5-cache/kde-apps/libktnef-19.08.1 b/metadata/md5-cache/kde-apps/libktnef-19.08.1 index 559ef95efd6d..a21e02d54401 100644 --- a/metadata/md5-cache/kde-apps/libktnef-19.08.1 +++ b/metadata/md5-cache/kde-apps/libktnef-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/ktnef-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bde7c4baf652abfc1c1685f80f6e63c3 diff --git a/metadata/md5-cache/kde-apps/lokalize-19.04.3 b/metadata/md5-cache/kde-apps/lokalize-19.04.3 index cd876e55c59c..7b829e762420 100644 --- a/metadata/md5-cache/kde-apps/lokalize-19.04.3 +++ b/metadata/md5-cache/kde-apps/lokalize-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/lokalize-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=74566f32fb5940a4d327ef26b4651657 diff --git a/metadata/md5-cache/kde-apps/lokalize-19.08.1 b/metadata/md5-cache/kde-apps/lokalize-19.08.1 index ccc077c8d7b2..af1d21fd28a3 100644 --- a/metadata/md5-cache/kde-apps/lokalize-19.08.1 +++ b/metadata/md5-cache/kde-apps/lokalize-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/lokalize-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d47aaed99d5797912a8495213bc621bb diff --git a/metadata/md5-cache/kde-apps/lskat-19.04.3 b/metadata/md5-cache/kde-apps/lskat-19.04.3 index dc448c2e1a34..f5d291ec67dc 100644 --- a/metadata/md5-cache/kde-apps/lskat-19.04.3 +++ b/metadata/md5-cache/kde-apps/lskat-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/lskat-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=040d619732cb90813fac10995f5631ed diff --git a/metadata/md5-cache/kde-apps/lskat-19.08.1 b/metadata/md5-cache/kde-apps/lskat-19.08.1 index bfce87816ec3..db9a0f1b4c71 100644 --- a/metadata/md5-cache/kde-apps/lskat-19.08.1 +++ b/metadata/md5-cache/kde-apps/lskat-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/lskat-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8b339cc3e0c2b45f0cac483124dd293e diff --git a/metadata/md5-cache/kde-apps/mailcommon-19.04.3 b/metadata/md5-cache/kde-apps/mailcommon-19.04.3 index ea0a90a8cb61..2492e84125c0 100644 --- a/metadata/md5-cache/kde-apps/mailcommon-19.04.3 +++ b/metadata/md5-cache/kde-apps/mailcommon-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/mailcommon-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=95bc66a166da0519669dedefd9fc5dff diff --git a/metadata/md5-cache/kde-apps/mailcommon-19.08.1 b/metadata/md5-cache/kde-apps/mailcommon-19.08.1 index 5b1fb9bc2a82..55ddfd807ac0 100644 --- a/metadata/md5-cache/kde-apps/mailcommon-19.08.1 +++ b/metadata/md5-cache/kde-apps/mailcommon-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/mailcommon-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b370dc6326987677696c3193d71f5a99 diff --git a/metadata/md5-cache/kde-apps/mailimporter-19.04.3 b/metadata/md5-cache/kde-apps/mailimporter-19.04.3 index bd8b56f3d6d1..e33445b042a1 100644 --- a/metadata/md5-cache/kde-apps/mailimporter-19.04.3 +++ b/metadata/md5-cache/kde-apps/mailimporter-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-mime-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/mailimporter-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=576c3ef0b3eb0657fdc2dbd551a36dd5 diff --git a/metadata/md5-cache/kde-apps/mailimporter-19.08.1 b/metadata/md5-cache/kde-apps/mailimporter-19.08.1 index b80f90af034a..920fe6264092 100644 --- a/metadata/md5-cache/kde-apps/mailimporter-19.08.1 +++ b/metadata/md5-cache/kde-apps/mailimporter-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/mailimporter-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=14d5b8ef786d1377644f762b785c3c5b diff --git a/metadata/md5-cache/kde-apps/marble-19.04.3 b/metadata/md5-cache/kde-apps/marble-19.04.3 index 68172b593320..de90ee2e940a 100644 --- a/metadata/md5-cache/kde-apps/marble-19.04.3 +++ b/metadata/md5-cache/kde-apps/marble-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/ RESTRICT=test SLOT=5/19.04 SRC_URI=mirror://kde/stable/applications/19.04.3/src/marble-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dbf5212204a1c934978af9fdf58cc024 diff --git a/metadata/md5-cache/kde-apps/marble-19.08.1 b/metadata/md5-cache/kde-apps/marble-19.08.1 index 174400c12e15..191501650ddf 100644 --- a/metadata/md5-cache/kde-apps/marble-19.08.1 +++ b/metadata/md5-cache/kde-apps/marble-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/ RESTRICT=test SLOT=5/19.08 SRC_URI=mirror://kde/stable/applications/19.08.1/src/marble-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d02e629c65168d5b3a5cc955d17aeb89 diff --git a/metadata/md5-cache/kde-apps/mbox-importer-19.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-19.04.3 index 6937438f0e98..887c2a86b86f 100644 --- a/metadata/md5-cache/kde-apps/mbox-importer-19.04.3 +++ b/metadata/md5-cache/kde-apps/mbox-importer-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/mailcommon-19.04.3:5 >=kde-apps/mailimporter-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/mbox-importer-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b58a90983ebfe5c1ae1b2a1be981b2a8 diff --git a/metadata/md5-cache/kde-apps/mbox-importer-19.08.1 b/metadata/md5-cache/kde-apps/mbox-importer-19.08.1 index 7a100b24a7fb..3dcf78dfd233 100644 --- a/metadata/md5-cache/kde-apps/mbox-importer-19.08.1 +++ b/metadata/md5-cache/kde-apps/mbox-importer-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/mailimporter-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/mbox-importer-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=926332e6cb7ef3d6d20dc25a35c7c522 diff --git a/metadata/md5-cache/kde-apps/messagelib-19.04.3 b/metadata/md5-cache/kde-apps/messagelib-19.04.3 index 1229d19143a3..2fd0dbea3f00 100644 --- a/metadata/md5-cache/kde-apps/messagelib-19.04.3 +++ b/metadata/md5-cache/kde-apps/messagelib-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/messagelib-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f2d1deefa43b640ce47e0ea2490273f6 diff --git a/metadata/md5-cache/kde-apps/messagelib-19.08.1 b/metadata/md5-cache/kde-apps/messagelib-19.08.1 index bde84c4a6daa..bc98387932c6 100644 --- a/metadata/md5-cache/kde-apps/messagelib-19.08.1 +++ b/metadata/md5-cache/kde-apps/messagelib-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/messagelib-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=21f9106819158fb99bd8272fc9439e97 diff --git a/metadata/md5-cache/kde-apps/minuet-19.04.3 b/metadata/md5-cache/kde-apps/minuet-19.04.3 index 305dab770793..5c93faf15628 100644 --- a/metadata/md5-cache/kde-apps/minuet-19.04.3 +++ b/metadata/md5-cache/kde-apps/minuet-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-sound/fluidsynth:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/minuet-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=647f7b052b471a1fe72d40688238d0e5 diff --git a/metadata/md5-cache/kde-apps/minuet-19.08.1 b/metadata/md5-cache/kde-apps/minuet-19.08.1 index 10e36f9a560e..ef66807ed5bf 100644 --- a/metadata/md5-cache/kde-apps/minuet-19.08.1 +++ b/metadata/md5-cache/kde-apps/minuet-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-sound/fluidsynth:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/minuet-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=14f7a5157c52af4a922c7527b20a3e0c diff --git a/metadata/md5-cache/kde-apps/okular-19.04.3 b/metadata/md5-cache/kde-apps/okular-19.04.3 index b92bb004612b..82eefca45cc4 100644 --- a/metadata/md5-cache/kde-apps/okular-19.04.3 +++ b/metadata/md5-cache/kde-apps/okular-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjs-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.60.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-19.04.3:5 >=dev-qt/qtgui-5.12.3:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-19.04.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.60.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/okular-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=25fafe04e12cf19c1edd49d44c26fe3c diff --git a/metadata/md5-cache/kde-apps/okular-19.08.1 b/metadata/md5-cache/kde-apps/okular-19.08.1 index f31b2b658ac2..727c45a165ae 100644 --- a/metadata/md5-cache/kde-apps/okular-19.08.1 +++ b/metadata/md5-cache/kde-apps/okular-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjs-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.60.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5(+)] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-19.08.1:5 >=dev-qt/qtgui-5.12.3:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-19.08.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.60.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/okular-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3a86f42c6b158525dac3ee58997a8a5f diff --git a/metadata/md5-cache/kde-apps/palapeli-19.04.3 b/metadata/md5-cache/kde-apps/palapeli-19.04.3 index 9cab676fae4f..70cac8a2c4c7 100644 --- a/metadata/md5-cache/kde-apps/palapeli-19.04.3 +++ b/metadata/md5-cache/kde-apps/palapeli-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/palapeli-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e5f0ab0bd7d766d47b52b3e5a0c80b44 diff --git a/metadata/md5-cache/kde-apps/palapeli-19.08.1 b/metadata/md5-cache/kde-apps/palapeli-19.08.1 index 194c586bbfe9..cf443ea25fe2 100644 --- a/metadata/md5-cache/kde-apps/palapeli-19.08.1 +++ b/metadata/md5-cache/kde-apps/palapeli-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/palapeli-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a491958df38483b8bb114babcfbc32bd diff --git a/metadata/md5-cache/kde-apps/parley-19.04.3 b/metadata/md5-cache/kde-apps/parley-19.04.3 index 3e9d1c65485c..6324f3f49b4a 100644 --- a/metadata/md5-cache/kde-apps/parley-19.04.3 +++ b/metadata/md5-cache/kde-apps/parley-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-apps/libkeduvocdocument-19.04.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/parley-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1085a54f5967a9cf8e7bdc4691063a6c diff --git a/metadata/md5-cache/kde-apps/parley-19.08.1 b/metadata/md5-cache/kde-apps/parley-19.08.1 index e9a7f891ae92..9a3352c08174 100644 --- a/metadata/md5-cache/kde-apps/parley-19.08.1 +++ b/metadata/md5-cache/kde-apps/parley-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-apps/libkeduvocdocument-19.08.1:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-19.08.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/parley-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=27edd2b1d61f0d3390f1fb34248dca29 diff --git a/metadata/md5-cache/kde-apps/picmi-19.04.3 b/metadata/md5-cache/kde-apps/picmi-19.04.3 index 9d01f5a674d4..9b5ae8b337f4 100644 --- a/metadata/md5-cache/kde-apps/picmi-19.04.3 +++ b/metadata/md5-cache/kde-apps/picmi-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.04.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/picmi-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c2b750ceff1ea744551a92ede8238731 diff --git a/metadata/md5-cache/kde-apps/picmi-19.08.1 b/metadata/md5-cache/kde-apps/picmi-19.08.1 index d945362ffddc..4f7c62b115dc 100644 --- a/metadata/md5-cache/kde-apps/picmi-19.08.1 +++ b/metadata/md5-cache/kde-apps/picmi-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libkdegames-19.08.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/picmi-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=09650ba9c5712417d3fa0c5e64df5a96 diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-19.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-19.04.3 index a6c2c31c217c..5c1bf394f535 100644 --- a/metadata/md5-cache/kde-apps/pim-data-exporter-19.04.3 +++ b/metadata/md5-cache/kde-apps/pim-data-exporter-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 >=kde-apps/kmailtransport-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=kde-apps/mailcommon-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/pim-data-exporter-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ae6e61e2484a514864539470961ef3a0 diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-19.08.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-19.08.1 index fbdfa45423a7..1a4e0eda6b4c 100644 --- a/metadata/md5-cache/kde-apps/pim-data-exporter-19.08.1 +++ b/metadata/md5-cache/kde-apps/pim-data-exporter-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpimtextedit-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/pim-data-exporter-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ba19407101a31579f3d654e805300024 diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.04.3 index eef91e9246c8..12ea7404f0ca 100644 --- a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.04.3 +++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/akonadi-mime-19.04.3:5 >=kde-apps/calendarsupport-19.04.3:5 >=kde-apps/kcalcore-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kmailtransport-19.04.3:5 >=kde-apps/libksieve-19.04.3:5 >=kde-apps/pimcommon-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/pim-sieve-editor-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=88295c90c876384a92f5c8ea741d473d diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.08.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.08.1 index a4a1591961af..7a9e904ff654 100644 --- a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.08.1 +++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/libksieve-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/pim-sieve-editor-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c6ab31c564af75dc5e0fa4a577e45536 diff --git a/metadata/md5-cache/kde-apps/pimcommon-19.04.3 b/metadata/md5-cache/kde-apps/pimcommon-19.04.3 index 6e0ad8d558bc..e0d60fc03e7a 100644 --- a/metadata/md5-cache/kde-apps/pimcommon-19.04.3 +++ b/metadata/md5-cache/kde-apps/pimcommon-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kimap-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-apps/libkdepim-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/pimcommon-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=45fb936db790fb729b2e364cc34e13c8 diff --git a/metadata/md5-cache/kde-apps/pimcommon-19.08.1 b/metadata/md5-cache/kde-apps/pimcommon-19.08.1 index a6e9f455b593..913298441080 100644 --- a/metadata/md5-cache/kde-apps/pimcommon-19.08.1 +++ b/metadata/md5-cache/kde-apps/pimcommon-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/purpose-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kimap-19.08.1:5 >=kde-apps/kpimtextedit-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/pimcommon-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dc666e3e7d9ab34d8df0653dce68f343 diff --git a/metadata/md5-cache/kde-apps/poxml-19.04.3 b/metadata/md5-cache/kde-apps/poxml-19.04.3 index d38410bb7c10..fb6547a9ab65 100644 --- a/metadata/md5-cache/kde-apps/poxml-19.04.3 +++ b/metadata/md5-cache/kde-apps/poxml-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtxml-5.12.3:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/poxml-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a7b4d41a6c68165129da49186a682e69 diff --git a/metadata/md5-cache/kde-apps/poxml-19.08.1 b/metadata/md5-cache/kde-apps/poxml-19.08.1 index dcae42c2affd..17c49b5dce71 100644 --- a/metadata/md5-cache/kde-apps/poxml-19.08.1 +++ b/metadata/md5-cache/kde-apps/poxml-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtxml-5.12.3:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/poxml-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=38dc54f34c471ea112100fdbd59a7172 diff --git a/metadata/md5-cache/kde-apps/print-manager-19.04.3 b/metadata/md5-cache/kde-apps/print-manager-19.04.3 index 2ee3eab04132..d038c1e45385 100644 --- a/metadata/md5-cache/kde-apps/print-manager-19.04.3 +++ b/metadata/md5-cache/kde-apps/print-manager-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-print/cups >=kde-plasma/kde-cli-tools-5.15.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/print-manager-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9178451b11639b9517a6299b1cf36584 diff --git a/metadata/md5-cache/kde-apps/print-manager-19.08.1 b/metadata/md5-cache/kde-apps/print-manager-19.08.1 index 76c1fdfdde9a..119798c16a57 100644 --- a/metadata/md5-cache/kde-apps/print-manager-19.08.1 +++ b/metadata/md5-cache/kde-apps/print-manager-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-print/cups >=kde-plasma/kde-cli-tools-5.15.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/print-manager-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bc02272370537bbab48c400cab7c6dfe diff --git a/metadata/md5-cache/kde-apps/rocs-19.04.3 b/metadata/md5-cache/kde-apps/rocs-19.04.3 index fe49d466c709..fea11df119ec 100644 --- a/metadata/md5-cache/kde-apps/rocs-19.04.3 +++ b/metadata/md5-cache/kde-apps/rocs-19.04.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/rocs-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=26c7ffe6bc9f89434f9fe87f62ec2d30 diff --git a/metadata/md5-cache/kde-apps/rocs-19.08.1 b/metadata/md5-cache/kde-apps/rocs-19.08.1 index 5a0c22df627a..2942fdb452c8 100644 --- a/metadata/md5-cache/kde-apps/rocs-19.08.1 +++ b/metadata/md5-cache/kde-apps/rocs-19.08.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/rocs-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5b7df48aecf1d83cfbe3a28a785d1c8a diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.04.3 index 96f28ac74f1d..6a7f503e959c 100644 --- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.04.3 +++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kwallet-5.60.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/signon-kwallet-extension-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cdc4dea899b8ef1105b467875bf1c996 diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.08.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.08.1 index ab4c205cd659..9ab76e32d9db 100644 --- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.08.1 +++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kwallet-5.60.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/signon-kwallet-extension-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1a761aa80214d3adcb81da1c2bd4b4ff diff --git a/metadata/md5-cache/kde-apps/spectacle-19.04.3 b/metadata/md5-cache/kde-apps/spectacle-19.04.3 index 2e40ae504397..50a0e9bf5e4e 100644 --- a/metadata/md5-cache/kde-apps/spectacle-19.04.3 +++ b/metadata/md5-cache/kde-apps/spectacle-19.04.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-19.04.3:5= ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) kipi? ( kde-apps/kipi-plugins:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/spectacle-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=92d285964bf296c10f22851a69f7fb98 diff --git a/metadata/md5-cache/kde-apps/spectacle-19.08.1 b/metadata/md5-cache/kde-apps/spectacle-19.08.1 index be3e38ce90f8..55b0fa123610 100644 --- a/metadata/md5-cache/kde-apps/spectacle-19.08.1 +++ b/metadata/md5-cache/kde-apps/spectacle-19.08.1 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-19.08.1:5= ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) kipi? ( >=kde-apps/kipi-plugins-19.08.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/spectacle-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=07f72a500f75441e218e33fb35a54851 diff --git a/metadata/md5-cache/kde-apps/step-19.04.3 b/metadata/md5-cache/kde-apps/step-19.04.3 index 0e590fb3eb4d..66d2884ff845 100644 --- a/metadata/md5-cache/kde-apps/step-19.04.3 +++ b/metadata/md5-cache/kde-apps/step-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/step-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=56e2376174038ba436ec9d813cc713f0 diff --git a/metadata/md5-cache/kde-apps/step-19.08.1 b/metadata/md5-cache/kde-apps/step-19.08.1 index 41bbf57ecbe7..246b73a3147f 100644 --- a/metadata/md5-cache/kde-apps/step-19.08.1 +++ b/metadata/md5-cache/kde-apps/step-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/step-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9b39e8ad5b4f735e96f7437b9f05408a diff --git a/metadata/md5-cache/kde-apps/svgpart-19.04.3 b/metadata/md5-cache/kde-apps/svgpart-19.04.3 index bc22b397855a..b8faef744226 100644 --- a/metadata/md5-cache/kde-apps/svgpart-19.04.3 +++ b/metadata/md5-cache/kde-apps/svgpart-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/svgpart-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c79a65e61d5c6ffd9ff26590c3fcf18a diff --git a/metadata/md5-cache/kde-apps/svgpart-19.08.1 b/metadata/md5-cache/kde-apps/svgpart-19.08.1 index c20ef8e1ecfe..7ac6ccec641d 100644 --- a/metadata/md5-cache/kde-apps/svgpart-19.08.1 +++ b/metadata/md5-cache/kde-apps/svgpart-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/svgpart-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=96e5b4f7205bc8dffc1c278b0b5b1286 diff --git a/metadata/md5-cache/kde-apps/sweeper-19.04.3 b/metadata/md5-cache/kde-apps/sweeper-19.04.3 index ecbaa690597f..c04f3c081e73 100644 --- a/metadata/md5-cache/kde-apps/sweeper-19.04.3 +++ b/metadata/md5-cache/kde-apps/sweeper-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/sweeper-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b12c8d803df0669eae2a56c360c22333 diff --git a/metadata/md5-cache/kde-apps/sweeper-19.08.1 b/metadata/md5-cache/kde-apps/sweeper-19.08.1 index 0ff14625fb0d..e787621420d6 100644 --- a/metadata/md5-cache/kde-apps/sweeper-19.08.1 +++ b/metadata/md5-cache/kde-apps/sweeper-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/sweeper-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dc863a2483af8d513f7bcdce6cff1e22 diff --git a/metadata/md5-cache/kde-apps/thumbnailers-19.04.3 b/metadata/md5-cache/kde-apps/thumbnailers-19.04.3 index 04c719acb4d0..03d745ad47cb 100644 --- a/metadata/md5-cache/kde-apps/thumbnailers-19.04.3 +++ b/metadata/md5-cache/kde-apps/thumbnailers-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 raw? ( >=kde-apps/libkdcraw-19.04.3:5 >=kde-apps/libkexiv2-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kdegraphics-thumbnailers-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=88f7f7a014ef5ad502fea36adc0c25d8 diff --git a/metadata/md5-cache/kde-apps/thumbnailers-19.08.1 b/metadata/md5-cache/kde-apps/thumbnailers-19.08.1 index 8b901407ba27..906400a38a35 100644 --- a/metadata/md5-cache/kde-apps/thumbnailers-19.08.1 +++ b/metadata/md5-cache/kde-apps/thumbnailers-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 raw? ( >=kde-apps/libkdcraw-19.08.1:5 >=kde-apps/libkexiv2-19.08.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdegraphics-thumbnailers-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=16ff9e038e024803c721b580d563ef6b diff --git a/metadata/md5-cache/kde-apps/umbrello-19.04.3 b/metadata/md5-cache/kde-apps/umbrello-19.04.3 index fe5abae8cc01..155b08173e66 100644 --- a/metadata/md5-cache/kde-apps/umbrello-19.04.3 +++ b/metadata/md5-cache/kde-apps/umbrello-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/umbrello-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=44cec2ac05f40528d28a840edea933b6 diff --git a/metadata/md5-cache/kde-apps/umbrello-19.08.1 b/metadata/md5-cache/kde-apps/umbrello-19.08.1 index cef30f205f71..da6507f5b3f3 100644 --- a/metadata/md5-cache/kde-apps/umbrello-19.08.1 +++ b/metadata/md5-cache/kde-apps/umbrello-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/umbrello-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9b8dff193c2a3bab3f38221553457c14 diff --git a/metadata/md5-cache/kde-apps/yakuake-19.08.1 b/metadata/md5-cache/kde-apps/yakuake-19.08.1 index 96aadc848a88..e6b9b65c3130 100644 --- a/metadata/md5-cache/kde-apps/yakuake-19.08.1 +++ b/metadata/md5-cache/kde-apps/yakuake-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/konsole-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 absolute-position? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/yakuake-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9c0d95894fa3f8703e086913f1c49baf diff --git a/metadata/md5-cache/kde-apps/yakuake-3.0.5-r1 b/metadata/md5-cache/kde-apps/yakuake-3.0.5-r1 index 02c299d22530..62cd5a2eadaa 100644 --- a/metadata/md5-cache/kde-apps/yakuake-3.0.5-r1 +++ b/metadata/md5-cache/kde-apps/yakuake-3.0.5-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/konsole-3.0.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 absolute-position? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/yakuake/3.0.5/src/yakuake-3.0.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/yakuake-3.0.5-patches.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=26bb7f68efb9cc99e338935efc68224b diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.04.3 index d84f43059c7f..9a7c01783713 100644 --- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.04.3 +++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.04.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.04.3/src/zeroconf-ioslave-19.04.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=235662d898e34dd7c6b9e87560fbed58 diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.08.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.08.1 index 9e8ad987bf9b..285b40e74c6a 100644 --- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.08.1 +++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.08.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdnssd-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/applications/19.08.1/src/zeroconf-ioslave-19.08.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7f1aae5dea5875c062971e6e8f3cc687 diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz Binary files differindex 8d347a702022..e46f01930887 100644 --- a/metadata/md5-cache/kde-frameworks/Manifest.gz +++ b/metadata/md5-cache/kde-frameworks/Manifest.gz diff --git a/metadata/md5-cache/kde-frameworks/attica-5.60.0 b/metadata/md5-cache/kde-frameworks/attica-5.60.0 index 34784a52091a..8819f0de10a7 100644 --- a/metadata/md5-cache/kde-frameworks/attica-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/attica-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/attica-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ad8a5a5d782f1c52809857de24cc1ae3 diff --git a/metadata/md5-cache/kde-frameworks/attica-5.62.0 b/metadata/md5-cache/kde-frameworks/attica-5.62.0 index 2b0b6198c1ad..90f97cf51ec9 100644 --- a/metadata/md5-cache/kde-frameworks/attica-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/attica-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/attica-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9fb89fb495dcc530b7cb82cc084a653e diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.60.0 b/metadata/md5-cache/kde-frameworks/baloo-5.60.0 index adecb12ac62f..197c9c091ae5 100644 --- a/metadata/md5-cache/kde-frameworks/baloo-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/baloo-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kd RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/baloo-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ef6adad1b8e14c003d20efae4eecb8bc diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.62.0 b/metadata/md5-cache/kde-frameworks/baloo-5.62.0 index 0783b7ae9e38..fda9645c32c4 100644 --- a/metadata/md5-cache/kde-frameworks/baloo-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/baloo-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kd RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/baloo-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9a1e97a439a98aaeb8b5ad3463bca85d diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0 index 8434666d9f44..bded68912100 100644 --- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=af0f3808d23351a9c52bcc1abdedd346 diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.62.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.62.0 index f4a76462e0f7..d3f5296868c2 100644 --- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/bluez-qt-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=059b8cd0f770a446f49421236cdea4d5 diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0 index 4d312aa5e08c..c87a36feecdb 100644 --- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0 @@ -9,5 +9,9 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 LICENSE=LGPL-3 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7e9e17e48916375dc0df5dfd914e1a47 diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.62.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.62.0 index a3e720a6d8c0..f243d9e8b0df 100644 --- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.62.0 @@ -9,5 +9,9 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 LICENSE=LGPL-3 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/breeze-icons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=77318f6416e0e24764c1954679c40cc5 diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0 index b7c54976773b..1397e6b6b8a4 100644 --- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0 @@ -9,5 +9,9 @@ KEYWORDS=amd64 arm64 x86 LICENSE=LGPL-3 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5600c953463d939afeb25a523b20742a diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.62.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.62.0 index b8c15b42dc9c..941616400218 100644 --- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.62.0 @@ -9,5 +9,9 @@ KEYWORDS=~amd64 ~arm64 ~x86 LICENSE=LGPL-3 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/breeze-icons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cd36bd3d78ef066c466b018faa83bfd1 diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0 index c4b79b12de78..b5ad9719875e 100644 --- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0 @@ -10,5 +10,9 @@ LICENSE=BSD RDEPEND=app-arch/libarchive[bzip2] SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/extra-cmake-modules-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2df2c3e6eda47fa5392574b3c0571014 diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0 index c49ec1e2608f..9d8c01ed8c21 100644 --- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0 @@ -10,5 +10,9 @@ LICENSE=BSD RDEPEND=app-arch/libarchive[bzip2] SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/extra-cmake-modules-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b6f098d1e9e765deed5c798f20f05f98 diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0 index aa95967fbbf5..5089974a3dd4 100644 --- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 > RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/frameworkintegration-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4ae7ac84c281f1d41b349347b70b8c06 diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0 index 432f4279f888..faa11ed9c848 100644 --- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 > RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/frameworkintegration-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0999e16227b02dc6342acda9113d6a30 diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.60.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.60.0 index fa97be5efdcd..5d9cb0f098ec 100644 --- a/metadata/md5-cache/kde-frameworks/kactivities-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kactivities-5.60.0 @@ -10,5 +10,9 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kactivities-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cc9e4f997c95971d171e629668c23625 diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.62.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.62.0 index 36df939ca675..7ca1a7464958 100644 --- a/metadata/md5-cache/kde-frameworks/kactivities-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kactivities-5.62.0 @@ -10,5 +10,9 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kactivities-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=216c9faa2388bfd43decaf9c078b0b64 diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0 index 795254295069..ce4da2efc7bf 100644 --- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kactivities-stats-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f5f33cc1b50d970ec59f4a31209d2523 diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.62.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.62.0 index b9eef048c02d..d96eb60ab9fc 100644 --- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kactivities-stats-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e018fbe6bd1c8ede77a8bd711ca4d9c7 diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.60.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.60.0 index b83b240fe2c6..584ce112a5c3 100644 --- a/metadata/md5-cache/kde-frameworks/kapidox-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kapidox-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si REQUIRED_USE=python_targets_python2_7 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kapidox-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4912a9b2b030bcafe7fd8eb8ab78ab8e diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.62.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.62.0 index d7b34df0f962..26a30c1e018c 100644 --- a/metadata/md5-cache/kde-frameworks/kapidox-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kapidox-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,python_tar REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kapidox-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=248e45c85cb75177c7fadf22fae6a5ba diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.60.0 b/metadata/md5-cache/kde-frameworks/karchive-5.60.0 index 77cd2f8ed570..43e22095f7b8 100644 --- a/metadata/md5-cache/kde-frameworks/karchive-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/karchive-5.60.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2.1 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/karchive-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5f886182dee9a2d56aa2c6c70e1ef6af diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.62.0 b/metadata/md5-cache/kde-frameworks/karchive-5.62.0 index f9caacf36e46..d2f688798594 100644 --- a/metadata/md5-cache/kde-frameworks/karchive-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/karchive-5.62.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2.1 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/karchive-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d774c3353253c647f3c3c9566cc366de diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.60.0 b/metadata/md5-cache/kde-frameworks/kauth-5.60.0 index 170f51004667..a6da71045bfe 100644 --- a/metadata/md5-cache/kde-frameworks/kauth-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kauth-5.60.0 @@ -11,5 +11,9 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent ) RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kauth-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7dd5f999d432100eb2d571fbc8be244e diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.62.0 b/metadata/md5-cache/kde-frameworks/kauth-5.62.0 index aadfd7d014b0..374d022aa8e8 100644 --- a/metadata/md5-cache/kde-frameworks/kauth-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kauth-5.62.0 @@ -11,5 +11,9 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent ) RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kauth-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ec793f9f42f7401c2632c646371fe672 diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0 index 57c6b8aca794..e257ace6649c 100644 --- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kbookmarks-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=38476b89607906bc2e037c877d20b7f2 diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0 index 9bd277b13c8a..e2f0ef1a177c 100644 --- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kbookmarks-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e00a0ff377feb4e39a915ccfbbfd8770 diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0 index 6002b9c3b9b1..e83c2cc37e3d 100644 --- a/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kdeclarative-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kcmutils-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0b56c127c2071cbfd2f27ec36d03d18f diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0 index 74101ee2dcc0..245cc6ceed2e 100644 --- a/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdeclarative-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kcmutils-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8c63b9908b3ef80e5eda3b28ac954de5 diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0 index 04edfd2b5b5e..18b016b66e06 100644 --- a/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kcodecs-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=821f7ab92eac40e01750a109d522f214 diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.62.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.62.0 index 01fac76037f7..9e8e601692be 100644 --- a/metadata/md5-cache/kde-frameworks/kcodecs-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.62.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kcodecs-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f49eefd55b27d6659d1c4309428c82df diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0 index f7f737f21401..d62c0fbbf637 100644 --- a/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kcompletion-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d6aba4576e1399ef76478af7a96d6463 diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.62.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.62.0 index 8a24f9671f52..7592fd4cc4e2 100644 --- a/metadata/md5-cache/kde-frameworks/kcompletion-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.62.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kcompletion-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c86314b01fff142cbbc444dac53760a9 diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1 b/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1 index bbcd09700a04..5e91afa17ed8 100644 --- a/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1 +++ b/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus- RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kconfig-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=52bdc57d8897123b0c510dc0300d4ab9 diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.62.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.62.0 index 48bc5eff3d20..59833a374e98 100644 --- a/metadata/md5-cache/kde-frameworks/kconfig-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kconfig-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus- RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kconfig-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f52a3f289ab0e1cee671f67a539d5ebf diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0 index c143da2b5787..bc1db4d1b6cf 100644 --- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kguiaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kconfigwidgets-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=51a75ac1e190699246c02d6f3d27caaf diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0 index c2a3027e004c..f4ffb6099ef9 100644 --- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kconfigwidgets-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8787b2ef19f844005d62ab88114e2960 diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0 index fb00e7b66cd5..105abe1068ef 100644 --- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kcoreaddons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c9f51f12599118cbb1d1ebd4754b1b96 diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.62.0 index 97a7d6df365a..1039ed3890ef 100644 --- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kcoreaddons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=001eeca222359496c710f95107e2ac67 diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.60.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.60.0 index cb2c6965c390..9d0e8ee2d791 100644 --- a/metadata/md5-cache/kde-frameworks/kcrash-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kcrash-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60: RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kcrash-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=57a343700f6ff87b446422889de77ab3 diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.62.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.62.0 index f8df29356ea6..9fc4478d5566 100644 --- a/metadata/md5-cache/kde-frameworks/kcrash-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kcrash-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62: RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kcrash-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9e11b34b68e723df56e9c1809ad36db9 diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0 index 5e0f9023be5c..e3cf39b43e39 100644 --- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kdbusaddons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=466f8e982ad9ec3f17a657b3c2673337 diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.62.0 index b67d2d5e2a59..72e86ff19432 100644 --- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kdbusaddons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2a536e6c6546591f54a4ee11a47773a6 diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0 index 1cfbadd4b63a..0a8ca8414f73 100644 --- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kglobalaccel-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kpackage-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kdeclarative-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ccbc586ddb91346c2ddf2b4bc4acc193 diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0 index b7f2ffeb9b25..a7e38b9516c1 100644 --- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kdeclarative-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d2caf1a8f981eab59d3758e8d8fc89c3 diff --git a/metadata/md5-cache/kde-frameworks/kded-5.60.0 b/metadata/md5-cache/kde-frameworks/kded-5.60.0 index 1642b9aac45b..5f0309f4a879 100644 --- a/metadata/md5-cache/kde-frameworks/kded-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kded-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kcrash-5.60:5 >=kde-frameworks/kdbusaddons-5.60:5 >=kde-frameworks/kinit-5.60:5 >=kde-frameworks/kservice-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kded-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=870302729c385b12c410ddfc67b221c0 diff --git a/metadata/md5-cache/kde-frameworks/kded-5.62.0 b/metadata/md5-cache/kde-frameworks/kded-5.62.0 index c2d1455fb603..5245211296cf 100644 --- a/metadata/md5-cache/kde-frameworks/kded-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kded-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kinit-5.62:5 >=kde-frameworks/kservice-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kded-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=09d9033fbd9c7f792420f382a2ebe33f diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0 index ac95d767ac5a..d43a8e9cb482 100644 --- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/kcodecs-5.60:5 >=kde-fram RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kdelibs4support-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b19a16a052094ce4e744a3a65089178b diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0 index 1d4c8abcc081..79af9944ca5f 100644 --- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-fram RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kdelibs4support-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=274f0f71d0ff96227d808a508be2416b diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0 index e142947350c2..9227242c69d2 100644 --- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 designer? ( >=dev-qt/designer-5.12.3:5 >=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kplotting-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=kde-frameworks/sonnet-5.60:5 ) webkit? ( >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kdewebkit-5.60:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kdesignerplugin-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=482336d87f71da8cfab3fb84a22a8af8 diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0 index e4643bb6c2e1..4988aab17907 100644 --- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kdesignerplugin-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f291a005edd5301f2fb33015645fbc51 diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.60.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.60.0 index e224abf7f74e..24c47ddff671 100644 --- a/metadata/md5-cache/kde-frameworks/kdesu-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdesu-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kpty-5.60:5 >=kde-frameworks/kservice-5.60:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kdesu-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a843ff06b485fd1268dba52a452b4b27 diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.62.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.62.0 index 9052e52d8f69..3854b7b40527 100644 --- a/metadata/md5-cache/kde-frameworks/kdesu-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdesu-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kpty-5.62:5 >=kde-frameworks/kservice-5.62:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kdesu-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=74f1b357bcce6af614dcbae4db8b35ce diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0 index a3d5fdd92279..ed9b6a0fd671 100644 --- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kjobwidgets-5.60:5 >=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwallet-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kdewebkit-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b349897e5c8f00d74cd5c730ac88ebb6 diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0 index 1a0816258eb6..01463204240d 100644 --- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwallet-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( >=kde-frameworks/kdesignerplugin-5.62:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kdewebkit-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bdc4ee7eea422cdfa9a6677f950ca45f diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0 index 0a07898d301e..7b9924327ae2 100644 --- a/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kdnssd-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=02a8e747ba7197e6cb535ff0ae51c08c diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.62.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.62.0 index d6ffc3dd3f31..889eeb9becde 100644 --- a/metadata/md5-cache/kde-frameworks/kdnssd-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kdnssd-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=25b4c81b056eb1719fc9794a67fd0589 diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0 index b358a3e733ba..f986e309f8e8 100644 --- a/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=kde-frameworks/karchive-5.60:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kdoctools-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=386eae76ad658b7c761e1bca232dca6c diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.62.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.62.0 index b6c779171e24..97448d73919c 100644 --- a/metadata/md5-cache/kde-frameworks/kdoctools-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.62.0 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=kde-frameworks/karchive-5.62:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kdoctools-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d95d170ebf1774fc1561a2ea18636255 diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0 index b8a5174bf83e..57a73e27e713 100644 --- a/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-f RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kemoticons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d68718b87f3472feb0e14d936e92b30a diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0 index 158b5b43ba96..ba5b4f8e034c 100644 --- a/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-f RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kemoticons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7b0cd911da5599294663b4b2940615eb diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0 index 98dacfaad1b0..a7254cc5d002 100644 --- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=dev- RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kfilemetadata-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=206acc27eda2a6520e609f5dc8a6ea5f diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0 index 6fcc66267fb5..e59eabefe6d8 100644 --- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=dev- RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kfilemetadata-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1b92ccda68775dc04fa0bc9f7671318c diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0 index d47193791fac..57613e0e25fc 100644 --- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kcrash-5.60:5 >=kde-frameworks/kdbusaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kglobalaccel-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ff75edf9183d782d7005de0c083603a9 diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.62.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.62.0 index 39db29dcdba1..5af78077a689 100644 --- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kglobalaccel-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=15f37f6e51557e6db84ff59d1d091001 diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0 index 12552aa7b128..d73174ff68f9 100644 --- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kguiaddons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ffe7338cf0c159ebdb4983e35c3c5b3f diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.62.0 index 1a7a58c108b8..1af56df72d13 100644 --- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kguiaddons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1a68d4de6e8ceba16142fb4002ab72ed diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.60.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.60.0 index ff291993b111..31954fdd8f25 100644 --- a/metadata/md5-cache/kde-frameworks/kholidays-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kholidays-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kholidays-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=70351dade8a8ff25de6501948d51afc4 diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.62.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.62.0 index b80634e63f83..6853636f5e87 100644 --- a/metadata/md5-cache/kde-frameworks/kholidays-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kholidays-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kholidays-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f2ea1db3e37ab62928940f7369f4aa48 diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.60.0 b/metadata/md5-cache/kde-frameworks/khtml-5.60.0 index bfd427380849..3bf5652cfee9 100644 --- a/metadata/md5-cache/kde-frameworks/khtml-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/khtml-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kglobalaccel-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kjobwidgets-5.60:5 >=kde-frameworks/kjs-5.60:5 >=kde-frameworks/knotifications-5.60:5 >=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwallet-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=kde-frameworks/sonnet-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/khtml-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ac16953ea26b3557fcf9563c464782a0 diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.62.0 b/metadata/md5-cache/kde-frameworks/khtml-5.62.0 index dd6f9a6c829e..92c43b5a72ee 100644 --- a/metadata/md5-cache/kde-frameworks/khtml-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/khtml-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kjs-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwallet-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/khtml-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ce0d8e127c13a5a5827485a4108268fc diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.60.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.60.0 index 6e2d51f0b157..f82e2dfa5df2 100644 --- a/metadata/md5-cache/kde-frameworks/ki18n-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/ki18n-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/ki18n-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9dbeb082f7f23e15006b46356b160a2e diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.62.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.62.0 index b2505b690fbb..05d359a27564 100644 --- a/metadata/md5-cache/kde-frameworks/ki18n-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/ki18n-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/ki18n-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3af0be3dcf9ff5b697ca461378d18ded diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0 index c5e45d405fe5..fe80f314c1aa 100644 --- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-f RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kiconthemes-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=792fad6dbeb3ea7483add4246a6b6253 diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0 index 7a41aaf7824f..818bb6537251 100644 --- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-f RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kiconthemes-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=abc0396d524871501ee8814ea18cddbb diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.60.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.60.0 index 790ec62e408e..0779f0bea4c4 100644 --- a/metadata/md5-cache/kde-frameworks/kidletime-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kidletime-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e REQUIRED_USE=xscreensaver? ( X ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kidletime-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0093197a0af65ab5a7390d01be870fb5 diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.62.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.62.0 index 09f874ab8db1..d8e88d3f7556 100644 --- a/metadata/md5-cache/kde-frameworks/kidletime-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kidletime-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e REQUIRED_USE=xscreensaver? ( X ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kidletime-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c4c34d848994bc5839c0f42307210b74 diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0 index c3f03b441806..20e809368f27 100644 --- a/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kimageformats-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=95da2c725e572842a9664c35ba6cb35a diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.62.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.62.0 index 727ef0cb9099..a70f48eac10c 100644 --- a/metadata/md5-cache/kde-frameworks/kimageformats-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/karchive-5.62:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kimageformats-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=63619573ef7b5ba4ae98730eca0f5251 diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.60.0 b/metadata/md5-cache/kde-frameworks/kinit-5.60.0 index 5bad0e1c54a2..a9b88117c7ff 100644 --- a/metadata/md5-cache/kde-frameworks/kinit-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kinit-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kcrash-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kinit-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3adc8909605206784dd5add43a2929a9 diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.62.0 b/metadata/md5-cache/kde-frameworks/kinit-5.62.0 index c47b43ea5fe0..0887045cdd1d 100644 --- a/metadata/md5-cache/kde-frameworks/kinit-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kinit-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kinit-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aff6251190aa59bccdb7d556cefe4feb diff --git a/metadata/md5-cache/kde-frameworks/kio-5.60.0 b/metadata/md5-cache/kde-frameworks/kio-5.60.0 index 765751216a45..e72b1b38383a 100644 --- a/metadata/md5-cache/kde-frameworks/kio-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kio-5.60.0 @@ -12,5 +12,9 @@ RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/karchive-5.60:5 >=kde-fra RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kio-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=506b4db80aaa151a3a9c9a925518518d diff --git a/metadata/md5-cache/kde-frameworks/kio-5.62.0 b/metadata/md5-cache/kde-frameworks/kio-5.62.0 index 02eb70bc0739..0ad23128189e 100644 --- a/metadata/md5-cache/kde-frameworks/kio-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kio-5.62.0 @@ -12,5 +12,9 @@ RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-fra RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kio-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c8ce8301fc09ace49dd243db52e2aefd diff --git a/metadata/md5-cache/kde-frameworks/kio-5.62.1 b/metadata/md5-cache/kde-frameworks/kio-5.62.1 index 2a7a57881e98..274dce192eb1 100644 --- a/metadata/md5-cache/kde-frameworks/kio-5.62.1 +++ b/metadata/md5-cache/kde-frameworks/kio-5.62.1 @@ -12,5 +12,9 @@ RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-fra RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kio-5.62.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c8ce8301fc09ace49dd243db52e2aefd diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.60.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.60.0 index 3e0bb04c9077..795cb3c74e0b 100644 --- a/metadata/md5-cache/kde-frameworks/kirigami-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kirigami-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgrap RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kirigami2-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=15ffed2aa6ec94e248eb683701372259 diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.62.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.62.0 index 3e96462e35e4..52e5cf376588 100644 --- a/metadata/md5-cache/kde-frameworks/kirigami-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kirigami-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgrap RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kirigami2-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=41bd2af8cc3029a8afb1fc300e1af882 diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0 index 514981b30a6e..5baed4fd2339 100644 --- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kitemmodels-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=58d1bea6109fff2bc6b3b0565d2f9d29 diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.62.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.62.0 index 654f0543db9d..35d202ab518c 100644 --- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kitemmodels-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=871b7639fd8f384730c2241b9b8e0ba2 diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0 index 462cc50e25e6..a6f1b832ab4a 100644 --- a/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kitemviews-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=702a65a9760ec373383266c337261635 diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0 index ec99f0987cbd..805a19504e75 100644 --- a/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kitemviews-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=31c970bde384a1bb12fbf489d02eaad2 diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0 index 071afd7bf4f0..6b0aebf7d669 100644 --- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kjobwidgets-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bd7c780fed1d0c12ae93b59208c161b4 diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.62.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.62.0 index 5d19bd5245f9..606be32495a0 100644 --- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kjobwidgets-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ac21ea6e74edd031ef2b7bf1d0a531f2 diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.60.0 b/metadata/md5-cache/kde-frameworks/kjs-5.60.0 index afc586fadc3f..172939dd86cc 100644 --- a/metadata/md5-cache/kde-frameworks/kjs-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kjs-5.60.0 @@ -10,5 +10,9 @@ LICENSE=BSD-2 LGPL-2+ RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kjs-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=91c3176af205d32df2731b94ed511548 diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.62.0 b/metadata/md5-cache/kde-frameworks/kjs-5.62.0 index b4853bbffdf2..066de806e9de 100644 --- a/metadata/md5-cache/kde-frameworks/kjs-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kjs-5.62.0 @@ -10,5 +10,9 @@ LICENSE=BSD-2 LGPL-2+ RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kjs-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8a0eed06e62e28834400e65704a31081 diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0 index f411bae91f4d..d4d178526dbf 100644 --- a/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kjs-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kjsembed-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5c9690f3ebe4642513459a81adcfb790 diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.62.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.62.0 index 425578257e37..44dd59a1ccdd 100644 --- a/metadata/md5-cache/kde-frameworks/kjsembed-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kjs-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kjsembed-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b922ba849f5df07598f031a87b0b631b diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0 index 8b13da6785d5..7d66a35aea9b 100644 --- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kmediaplayer-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d725bf6277d797c32a3f1d90e79642da diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0 index 3b55553e4635..d0e30098f43a 100644 --- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kmediaplayer-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=53bb73b1c43bc0cf83744a45c00b31a0 diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0 index f885919071ce..671bf747b82b 100644 --- a/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/attica-5.60:5 >=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.60:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/knewstuff-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=48669c605da5b3e468b7c2467ef62bb4 diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0 index 928ea5490189..56aeeec07593 100644 --- a/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/attica-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/knewstuff-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e6096df047d5eb3a1ab83b48b1195d29 diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.60.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.60.0 index 88150d3da6dd..bfe97c193a05 100644 --- a/metadata/md5-cache/kde-frameworks/knotifications-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/knotifications-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/knotifications-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=33b4b5b93cdc1ed2da31d83699dd6cb9 diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.62.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.62.0 index 9c431dfdeae8..9e6009720343 100644 --- a/metadata/md5-cache/kde-frameworks/knotifications-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/knotifications-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/knotifications-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5345b60ee0e246a8a1df953ebe0243e5 diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0 index 7cbd09ea3e48..c1a05c16bbaf 100644 --- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/knotifyconfig-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c38c2f3e1226d25f2fd5c2972b166e3d diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0 index 01d417560384..25917cadbc0a 100644 --- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/knotifyconfig-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7e56c4d4ee885056931fe839aa6fbae5 diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.60.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.60.0 index 40be0877cd41..3c7ea6032e76 100644 --- a/metadata/md5-cache/kde-frameworks/kpackage-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kpackage-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kpackage-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6ef2a59e9e53e4f2a0bedb39a2b82556 diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.62.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.62.0 index fcce0a101bcc..702963bb76c6 100644 --- a/metadata/md5-cache/kde-frameworks/kpackage-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kpackage-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kpackage-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cabbdcc92ae000804e1c07889777d040 diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.60.0 b/metadata/md5-cache/kde-frameworks/kparts-5.60.0 index c44d58864bb8..547c733b8ff3 100644 --- a/metadata/md5-cache/kde-frameworks/kparts-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kparts-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kjobwidgets-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kparts-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b5d02ea0c87530f28b9f33fbb5623706 diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.62.0 b/metadata/md5-cache/kde-frameworks/kparts-5.62.0 index 1375718f5192..de2dd1ef0a6e 100644 --- a/metadata/md5-cache/kde-frameworks/kparts-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kparts-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kparts-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4883d5a35a32d54c34370274d5fcce84 diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.60.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.60.0 index 0b06847e9498..33bc9aaaef09 100644 --- a/metadata/md5-cache/kde-frameworks/kpeople-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kpeople-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kpeople-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6f65a931c9f491c6b690c23f01923701 diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.62.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.62.0 index 411c76c6d8ad..a894d9ef83c8 100644 --- a/metadata/md5-cache/kde-frameworks/kpeople-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kpeople-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kpeople-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=78cd97d7fcddb4540cbce2778f308dce diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.60.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.60.0 index e4ca717841df..cf8bc4f3aecb 100644 --- a/metadata/md5-cache/kde-frameworks/kplotting-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kplotting-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kplotting-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=125961b7e643c462d2b29060b16fcf0a diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.62.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.62.0 index 6e8a996b4fdd..6b2f16eb4fc6 100644 --- a/metadata/md5-cache/kde-frameworks/kplotting-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kplotting-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kplotting-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f9c0fb653817f56bc35e2d91629c9ba9 diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.60.0 b/metadata/md5-cache/kde-frameworks/kpty-5.60.0 index e63df20068b2..089550df2a6c 100644 --- a/metadata/md5-cache/kde-frameworks/kpty-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kpty-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kpty-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f3a379fe38744a1c5314bea149339e44 diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.62.0 b/metadata/md5-cache/kde-frameworks/kpty-5.62.0 index 1ef57e7ffee4..c4b5d7108127 100644 --- a/metadata/md5-cache/kde-frameworks/kpty-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kpty-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kpty-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9296bc5641c78fc1fd9a4410e72a8ec7 diff --git a/metadata/md5-cache/kde-frameworks/kross-5.60.0 b/metadata/md5-cache/kde-frameworks/kross-5.60.0 index 5874eb1a8b21..546d9c93836a 100644 --- a/metadata/md5-cache/kde-frameworks/kross-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kross-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=46259dbc21cf36b2040bab5c4f0a34ee diff --git a/metadata/md5-cache/kde-frameworks/kross-5.62.0 b/metadata/md5-cache/kde-frameworks/kross-5.62.0 index 294b0eafd6ed..1d7b2454cf48 100644 --- a/metadata/md5-cache/kde-frameworks/kross-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kross-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kross-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=281b005dcd85ed889ae9a1133215ffcd diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.60.0 b/metadata/md5-cache/kde-frameworks/krunner-5.60.0 index a568897d4cf1..3b3dff0d4137 100644 --- a/metadata/md5-cache/kde-frameworks/krunner-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/krunner-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/plasma-5.60:5 >=kde-frameworks/solid-5.60:5 >=kde-frameworks/threadweaver-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/krunner-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=16cd4abf6666ff533ace822d8a5e6136 diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.62.0 b/metadata/md5-cache/kde-frameworks/krunner-5.62.0 index b12d2fe42d1f..38cdd4eff6c2 100644 --- a/metadata/md5-cache/kde-frameworks/krunner-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/krunner-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/plasma-5.62:5 >=kde-frameworks/solid-5.62:5 >=kde-frameworks/threadweaver-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/krunner-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8f16ac34f4b421a3d9fd463f0a8369c1 diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.60.0 b/metadata/md5-cache/kde-frameworks/kservice-5.60.0 index ca940f661385..953c18892d12 100644 --- a/metadata/md5-cache/kde-frameworks/kservice-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kservice-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kd RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kservice-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0e27ed9374cf9a2179891862e05e80de diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.62.0 b/metadata/md5-cache/kde-frameworks/kservice-5.62.0 index 70831f59f7a6..b1bcd5b72800 100644 --- a/metadata/md5-cache/kde-frameworks/kservice-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kservice-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kd RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kservice-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=62b451ea58e805fec73d677921e7ae13 diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0 index 7d70d22d653a..a66df6297c52 100644 --- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kauth-5.60:5 >=kde-fra RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/ktexteditor-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=97ffcf0f180fe43616f8b8f270228846 diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0 index 24b06f27e53d..2031bb46502b 100644 --- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kauth-5.62:5 >=kde-fra RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/ktexteditor-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4fc6b4448fd83a1706923558fcb469fa diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0 index 466ecc970d84..8ea07bf7a787 100644 --- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=kde-frameworks/sonnet-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/ktextwidgets-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2d19072f46fbf740052f6f45717f7882 diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0 index 42070b5b9db0..133257d2aadb 100644 --- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/ktextwidgets-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b64d42daeb885aea5278d8b90df03603 diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0 index cae95392af01..56988cea96de 100644 --- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.60:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kunitconversion-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4bbb1e5eb8312ee849ff67b846d7b3ed diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.62.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.62.0 index 558f64903b02..4d2deb136577 100644 --- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kunitconversion-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9ba11d07023757f402965a792d7dcbcc diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.60.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.60.0 index ddcb3a0fd94b..87756427814b 100644 --- a/metadata/md5-cache/kde-frameworks/kwallet-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kwallet-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kdbusaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/knotifications-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kwallet-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=62f890378ec76e82dc27d4e97b3c0509 diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.62.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.62.0 index 93a350598f6d..4980389a215f 100644 --- a/metadata/md5-cache/kde-frameworks/kwallet-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kwallet-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kwallet-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=19c7d9ec78081b56925bd49b5e4a0f4a diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.60.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.60.0 index 0c344115640e..b4750b9a01c3 100644 --- a/metadata/md5-cache/kde-frameworks/kwayland-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kwayland-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/w RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kwayland-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1334a5382ab7f470702b4b9dca3a6e66 diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.62.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.62.0 index 5eb1ee79351b..b420117a6cb3 100644 --- a/metadata/md5-cache/kde-frameworks/kwayland-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kwayland-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/w RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kwayland-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c149d0ee480bd64b96b389047fe3f8ae diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0 index 3ea918c71457..27c28519f325 100644 --- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kwidgetsaddons-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=abbff0774b4ba0e293b35741b661395f diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0 index 34d3a907c224..007658842b22 100644 --- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kwidgetsaddons-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5e12afa32064f07495b63b33a975cd2b diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0 index 27fcd2ab5622..5374f549fa44 100644 --- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kwindowsystem-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a0885490603b8700b58e9f23fe7402b7 diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.62.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.62.0 index a2c54780bf73..60e058ca9548 100644 --- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kwindowsystem-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a8a1f4008c2f068d86e731385ef5bccf diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0 index 44722fd9d06a..795bca112c6d 100644 --- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kglobalaccel-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.60:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kxmlgui-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6be1ee2212b0f516319ab7914a9fe65c diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0 index 52a517842d5e..15393394b7cc 100644 --- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.62:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kxmlgui-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=39a6a39690a60cece426647fb97a9f59 diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0 index a5e5d71ea544..fd0b5ab64412 100644 --- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0 @@ -10,5 +10,9 @@ LICENSE=BSD-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/kxmlrpcclient-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0f609e16d03f09a43f4833207763eb77 diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0 index 0a411b2dcdb2..4bbad7ece159 100644 --- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0 @@ -10,5 +10,9 @@ LICENSE=BSD-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/kxmlrpcclient-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fcb92ecbe4b1266177036cb0b9701305 diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0 index bd70dd7e3543..b18297a317af 100644 --- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager > RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/modemmanager-qt-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=57dc2c72d0eb5c79690bc7c18e144277 diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.62.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.62.0 index 5fe98f030076..ebc0ba6a965c 100644 --- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager > RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/modemmanager-qt-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=831b5b64ca44199fa49dcf0ae2236f4f diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0 index dcc57127bed2..e13a63661b55 100644 --- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/networkmanager-qt-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4205581b4fc59a570373f1330c09a1d5 diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0 index 88444c06df4e..a122cb5c234d 100644 --- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/networkmanager-qt-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fd2f7b0aea0a301467124b91c09ee1e3 diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0 index f2cd5945e29b..6ff9d1eeb48e 100644 --- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-3 RDEPEND=!kde-frameworks/oxygen-icons:4 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/oxygen-icons5-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4752b0708b985bb477696a83380c3803 diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.62.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.62.0 index c5e16b8f832e..b3c6b2fc4c2f 100644 --- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-3 RDEPEND=!kde-frameworks/oxygen-icons:4 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/oxygen-icons5-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=97310d661c31532588775c149ef06dad diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.60.0 b/metadata/md5-cache/kde-frameworks/plasma-5.60.0 index 1ce3453fd6d1..53936de1a7ee 100644 --- a/metadata/md5-cache/kde-frameworks/plasma-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/plasma-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kactivities-5.60:5 >=kde-frameworks/karchive-5.60:5 >=k RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/plasma-framework-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a5224a61961f610f0196eb1d2e75780c diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.62.0 b/metadata/md5-cache/kde-frameworks/plasma-5.62.0 index 0151e6de5202..e4c05118708c 100644 --- a/metadata/md5-cache/kde-frameworks/plasma-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/plasma-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kactivities-5.62:5 >=kde-frameworks/karchive-5.62:5 >=k RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/plasma-framework-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ba850f4c341a42db2a1e6d7d0a03076e diff --git a/metadata/md5-cache/kde-frameworks/prison-5.60.0 b/metadata/md5-cache/kde-frameworks/prison-5.60.0 index f6a7416def97..28e62704e504 100644 --- a/metadata/md5-cache/kde-frameworks/prison-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/prison-5.60.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/prison-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=367cae885cb95873f1c57faeaee8c7d7 diff --git a/metadata/md5-cache/kde-frameworks/prison-5.62.0 b/metadata/md5-cache/kde-frameworks/prison-5.62.0 index 01a7cf0db510..9436fd9dd338 100644 --- a/metadata/md5-cache/kde-frameworks/prison-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/prison-5.62.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/prison-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=33db6b8759d040c4296565934463f72a diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.60.0 b/metadata/md5-cache/kde-frameworks/purpose-5.60.0 index 130ec07f4d1c..12af4b3acdd7 100644 --- a/metadata/md5-cache/kde-frameworks/purpose-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/purpose-5.60.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde- RESTRICT=test SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/purpose-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=41036cd65fc46b57faf80a4258ea69e5 diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.62.0 b/metadata/md5-cache/kde-frameworks/purpose-5.62.0 index dfc44e03a6d8..039d10cd5ca2 100644 --- a/metadata/md5-cache/kde-frameworks/purpose-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/purpose-5.62.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde- RESTRICT=test SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/purpose-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5c7cda65d54008c6125e1df3eca8164f diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0 index adbf3dd2822d..494ab3acd8ae 100644 --- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2+ LGPL-3+ ) RDEPEND=>=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kirigami-5.60:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/qqc2-desktop-style-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=94fc72bae3022e1a8e5b8317950ded2f diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.62.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.62.0 index 803cd7587787..e72099e46ccd 100644 --- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.62.0 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2+ LGPL-3+ ) RDEPEND=>=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/qqc2-desktop-style-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f75add89ab7dcdc67a8b1e02bf60de0f diff --git a/metadata/md5-cache/kde-frameworks/solid-5.60.0 b/metadata/md5-cache/kde-frameworks/solid-5.60.0 index 8f849bd68017..2957e0670a76 100644 --- a/metadata/md5-cache/kde-frameworks/solid-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/solid-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/solid-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=625c0e9d2c3f1b47d25fa509ddc5fd3e diff --git a/metadata/md5-cache/kde-frameworks/solid-5.62.0 b/metadata/md5-cache/kde-frameworks/solid-5.62.0 index 40c23889dd31..948a2e4d1ad2 100644 --- a/metadata/md5-cache/kde-frameworks/solid-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/solid-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/solid-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0a24da3af6306a572aeb9165973269c1 diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.60.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.60.0 index 8c14dd3654e8..aa56e54d0e70 100644 --- a/metadata/md5-cache/kde-frameworks/sonnet-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/sonnet-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/sonnet-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dd7ee658dc8b1d017125f7783ca5894a diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.62.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.62.0 index 3b9ec56aba8f..9a5626e73286 100644 --- a/metadata/md5-cache/kde-frameworks/sonnet-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/sonnet-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/sonnet-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=98802b15923a403ec4212ee0dde0019e diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.60.0 b/metadata/md5-cache/kde-frameworks/syndication-5.60.0 index 4dbbfbba4168..c1ec4cd4265a 100644 --- a/metadata/md5-cache/kde-frameworks/syndication-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/syndication-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.60:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/syndication-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=62d0dde3569cebcf7fb07ef73b0d5424 diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.62.0 b/metadata/md5-cache/kde-frameworks/syndication-5.62.0 index 3120c00243de..4b4f91a51f98 100644 --- a/metadata/md5-cache/kde-frameworks/syndication-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/syndication-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcodecs-5.62:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/syndication-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b13ec3f095699da5d354fedf1249b0e0 diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0 index ee33bcb098b9..34ec01459576 100644 --- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/syntax-highlighting-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=68492c8d951471b732c3826a0c1348df diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.62.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.62.0 index 14392dc802ae..7e2e0fb66193 100644 --- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ LGPL-2.1+ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/syntax-highlighting-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0bb0bcca5e221b206b98d6a4044e7bb0 diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0 index b2b9f8a65ac3..5754970c802c 100644 --- a/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0 +++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.60 SRC_URI=mirror://kde/stable/frameworks/5.60/threadweaver-5.60.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cc9d6396b36c219b189061d9bc6465bb diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.62.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.62.0 index 4d17a992ea5f..0c25b5861cc0 100644 --- a/metadata/md5-cache/kde-frameworks/threadweaver-5.62.0 +++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.62.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 ) SLOT=5/5.62 SRC_URI=mirror://kde/stable/frameworks/5.62/threadweaver-5.62.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=719649c57268d7347a5f24b6cc16a47c diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz Binary files differindex 2a05e5ec8f42..50118460e5d6 100644 --- a/metadata/md5-cache/kde-misc/Manifest.gz +++ b/metadata/md5-cache/kde-misc/Manifest.gz diff --git a/metadata/md5-cache/kde-misc/basket-2.49b b/metadata/md5-cache/kde-misc/basket-2.49b index 6c8c509bfb1c..2cc7b58bb3ac 100644 --- a/metadata/md5-cache/kde-misc/basket-2.49b +++ b/metadata/md5-cache/kde-misc/basket-2.49b @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/basket-notepads/basket/archive/v2.49b.tar.gz -> basket-2.49b.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=040eb690aa55e0ac7592c0f999ab2dce diff --git a/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r1 b/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r1 index b026391f6ae3..b23489cf43cc 100644 --- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r1 +++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.15.5:5 x11-misc/colord >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/colord-kde-0.5.0-patches.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4863ecb26a814834a0d3c9fbfae8c7b8 diff --git a/metadata/md5-cache/kde-misc/gmailfeed-1.1-r1 b/metadata/md5-cache/kde-misc/gmailfeed-1.1-r1 index 8421ce933f5a..24e7c3fec252 100644 --- a/metadata/md5-cache/kde-misc/gmailfeed-1.1-r1 +++ b/metadata/md5-cache/kde-misc/gmailfeed-1.1-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-3+ RDEPEND=>=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtnetwork-5.12.1:5 >=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)] >=dev-qt/qtquickcontrols-5.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.1:5 SLOT=5 SRC_URI=https://github.com/anthon38/gmailfeed/archive/v1.1.tar.gz -> gmailfeed-1.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8dd344311ef8c9bfb56ba353ca3600d7 diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.5 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.5 index bbfcc12e166d..e41e3016827e 100644 --- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.5 +++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/kdeconnect/1.3.5/kdeconnect-kde-1.3.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=df84abbedbd1feadcf64d206dc099353 diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.1 b/metadata/md5-cache/kde-misc/kdiff3-1.8.1 index 0b8c08939dcd..252c0e122ea3 100644 --- a/metadata/md5-cache/kde-misc/kdiff3-1.8.1 +++ b/metadata/md5-cache/kde-misc/kdiff3-1.8.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-apps/diffutils !kde-misc/kdiff3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=05753641114a12139b965d1979a68940 diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.4 b/metadata/md5-cache/kde-misc/kdirstat-3.1.4 index 2f94f1099d0d..b06bd728388f 100644 --- a/metadata/md5-cache/kde-misc/kdirstat-3.1.4 +++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.4 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=66db19cb3b2071fa766eff1f7ba9a2c5 diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225 b/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225 index 79b642b40d7a..ed165107d818 100644 --- a/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225 +++ b/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/KDE/kimtoy/archive/c8b3da65bfd289d0a0262aa673aa6b697022d4a3.tar.gz -> kimtoy-1.92_pre20190225.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=97ccadcac4b60fb6d357cb7f421c1082 diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.6 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.6 index 684a56888c16..1536e59783d0 100644 --- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.6 +++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.6 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 <kde-apps/libkgapi-19.04.50 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.6/src/kio-gdrive-1.2.6.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6f25c328bca884c459ae27cee4e8d072 diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7 index 80a9a4b9e902..8651b9c0c92e 100644 --- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7 +++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/libkgapi-19.08.0:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.08.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.7/src/kio-gdrive-1.2.7.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5e8141941096cd1c2697268410c5cfc2 diff --git a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1 b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1 index b04ab8bc8be3..56ec26fc9b3e 100644 --- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1 +++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=11b040eac5f80b7c859d69d91ac9b730 diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r2 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r2 index 7c824d30099b..9784da170e09 100644 --- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r2 +++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 sys-apps/mlocate >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1460972255/120965-kio-locate-0.5.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d9663d94498169d6c94f5069d818eb50 diff --git a/metadata/md5-cache/kde-misc/kio-stash-1.0-r1 b/metadata/md5-cache/kde-misc/kio-stash-1.0-r1 index fdfcd433666b..5759d721d045 100644 --- a/metadata/md5-cache/kde-misc/kio-stash-1.0-r1 +++ b/metadata/md5-cache/kde-misc/kio-stash-1.0-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 RESTRICT=test SLOT=0 SRC_URI=mirror://kde/stable/kio-stash/kio-stash-1.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=602d99f711d4847efd11caeb9857c529 diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5 index 8d72a17615cb..7126f8cc3e19 100644 --- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5 +++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5 @@ -10,5 +10,9 @@ LICENSE=!webkit? ( BSD ) LGPL-2.1+ RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.5/src/kmarkdownwebview-0.5.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=afa9dd235ed278f9935c8731f15816f7 diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 index b9029999d033..359572911d35 100644 --- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 +++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 @@ -10,5 +10,9 @@ LICENSE=BSD-2 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/KDE/kolor-manager/archive/1.1.0.tar.gz -> kolor-manager-1.1.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d2e0130dd71f0b4292076bae846a322c diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0-r1 b/metadata/md5-cache/kde-misc/krename-5.0.0-r1 index 0d8217063a36..8b05582c9088 100644 --- a/metadata/md5-cache/kde-misc/krename-5.0.0-r1 +++ b/metadata/md5-cache/kde-misc/krename-5.0.0-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kjs-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo:= ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/krename/5.0.0/src/krename-5.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f401afbd3b085df7f483953e2b3bf2ac diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.1-r1 b/metadata/md5-cache/kde-misc/krusader-2.7.1-r1 index 0e993051c4c3..de6bd35fea81 100644 --- a/metadata/md5-cache/kde-misc/krusader-2.7.1-r1 +++ b/metadata/md5-cache/kde-misc/krusader-2.7.1-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/krusader/2.7.1/krusader-2.7.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=eb76b1320a38ed7953d742202698274d diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.2 b/metadata/md5-cache/kde-misc/krusader-2.7.2 index 64a075bb96ca..d7cf6103204d 100644 --- a/metadata/md5-cache/kde-misc/krusader-2.7.2 +++ b/metadata/md5-cache/kde-misc/krusader-2.7.2 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/krusader/2.7.2/krusader-2.7.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=59c11ae96f6f836a7e03f8a45132569b diff --git a/metadata/md5-cache/kde-misc/kshutdown-5.0 b/metadata/md5-cache/kde-misc/kshutdown-5.0 index ad8e2946d3cc..d4ece5c458ea 100644 --- a/metadata/md5-cache/kde-misc/kshutdown-5.0 +++ b/metadata/md5-cache/kde-misc/kshutdown-5.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) SLOT=5 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-5.0.zip +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5067bc1f830b0f69c67d0bca82005d74 diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 index 433c309ec385..7f82314ef3a1 100644 --- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 +++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/libmnl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5715111b6c5e3e355c463137438b03f3 diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20190110 b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20190110 index b2673f9ad72a..648687b4f5e4 100644 --- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20190110 +++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20190110 @@ -10,5 +10,9 @@ LICENSE=LGPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/KDE/kwebkitpart/archive/ed6b8c87fabeb563109a093c1f79eeb03867b053.tar.gz -> kwebkitpart-1.4.0_pre20190110.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=727511c987d46831904c9bf9feb48ea5 diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.9 b/metadata/md5-cache/kde-misc/latte-dock-0.8.9 index 2b25f3c9f2a5..bdc00c72a8dc 100644 --- a/metadata/md5-cache/kde-misc/latte-dock-0.8.9 +++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.9 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kactivities-5.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.9.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4030bb81a15a54957d3e5a1dd6b0df69 diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.9.1 b/metadata/md5-cache/kde-misc/latte-dock-0.9.1 index b4c8adabf2fb..bacc5b64df24 100644 --- a/metadata/md5-cache/kde-misc/latte-dock-0.9.1 +++ b/metadata/md5-cache/kde-misc/latte-dock-0.9.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kactivities-5.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=kde-plasma/libksysguard-5.15.5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.9.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ec694d7cead7593cf912f9fbecce3222 diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.9.2 b/metadata/md5-cache/kde-misc/latte-dock-0.9.2 index f859deb09436..c42d78de815e 100644 --- a/metadata/md5-cache/kde-misc/latte-dock-0.9.2 +++ b/metadata/md5-cache/kde-misc/latte-dock-0.9.2 @@ -10,5 +10,10 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kactivities-5.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=kde-plasma/libksysguard-5.15.5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.9.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=ec694d7cead7593cf912f9fbecce3222 +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=06d0ff925819d3db11e4169dfc20b4bd +>>>>>>> next diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 index 4ce9f5039954..821a22ffd751 100644 --- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 +++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 @@ -10,5 +10,9 @@ LICENSE=LGPL-3 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=685838af8522bc032615c50b61ebd975 diff --git a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1 b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1 index 90484f03de99..2a7022fd4be4 100644 --- a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1 +++ b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/kotelnik/plasma-applet-network-monitor/archive/v1.7.3.tar.gz -> plasma-applet-network-monitor-1.7.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=79b63d395e09909615aeea3a7fb65fe7 diff --git a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1 b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1 index c287116a85f4..f439c33a16dd 100644 --- a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1 +++ b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.1:5 SLOT=5 SRC_URI=https://github.com/kotelnik/plasma-applet-weather-widget/archive/v1.6.10.tar.gz -> plasma-applet-weather-widget-1.6.10.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d7f90814d23c740bd3060dd6ef3c8a72 diff --git a/metadata/md5-cache/kde-misc/plasma-pass-1.0.0 b/metadata/md5-cache/kde-misc/plasma-pass-1.0.0 index a85b433e5ffa..7c70f311ec44 100644 --- a/metadata/md5-cache/kde-misc/plasma-pass-1.0.0 +++ b/metadata/md5-cache/kde-misc/plasma-pass-1.0.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma-pass/plasma-pass-1.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1215db2ca8c977eaa8624515f26694d0 diff --git a/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18-r1 b/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18-r1 index 856d77d6fb26..1a7e3b530987 100644 --- a/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18-r1 +++ b/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/plasma-5.60.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/kotelnik/plasma-applet-redshift-control/archive/v1.0.18.tar.gz -> plasma-applet-redshift-control-1.0.18.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8bc385087b894e320da4538782e88ed6 diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.10-r1 b/metadata/md5-cache/kde-misc/rsibreak-0.12.10-r1 index 94142c874f3e..55d1acb988e3 100644 --- a/metadata/md5-cache/kde-misc/rsibreak-0.12.10-r1 +++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.10-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.10.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=83814cd635b6614c6ba45e3a752087a4 diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.11 b/metadata/md5-cache/kde-misc/rsibreak-0.12.11 index f375326ea383..1eba3ba9934f 100644 --- a/metadata/md5-cache/kde-misc/rsibreak-0.12.11 +++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.11 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.11.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=28da0dc9b62d3d5737f0d86b8b6606b7 diff --git a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1 b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1 index afacafed60e6..8938d76a45f1 100644 --- a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1 +++ b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/libksane-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libpng:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/skanlite/2.1/skanlite-2.1.0.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=400dcec0f13a4df45a7d72a73e3e7a95 diff --git a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 index e136546bcb3f..80b74a2e99b9 100644 --- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 +++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-apps/systemd:= !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ae32e7316abb1b7185cd84af883624ef diff --git a/metadata/md5-cache/kde-misc/tellico-3.2.1 b/metadata/md5-cache/kde-misc/tellico-3.2.1 index 89e8a2d7aee5..d927eda6be06 100644 --- a/metadata/md5-cache/kde-misc/tellico-3.2.1 +++ b/metadata/md5-cache/kde-misc/tellico-3.2.1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=http://tellico-project.org/files/tellico-3.2.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=da133e864254ab1451741931eb65d955 diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.2.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.2.0 index ae61bb8be637..8efd0349c024 100644 --- a/metadata/md5-cache/kde-misc/wacomtablet-3.2.0 +++ b/metadata/md5-cache/kde-misc/wacomtablet-3.2.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/wacomtablet/3.2.0/wacomtablet-3.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a38a960e8b7014d1560c9e384085bf2a diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.0-r1 b/metadata/md5-cache/kde-misc/zanshin-0.5.0-r1 index a5011027e39f..5c42464e50f8 100644 --- a/metadata/md5-cache/kde-misc/zanshin-0.5.0-r1 +++ b/metadata/md5-cache/kde-misc/zanshin-0.5.0-r1 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2 GPL-3 ) RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 <kde-apps/akonadi-19.04.50:5 <kde-apps/akonadi-calendar-19.04.50:5 <kde-apps/akonadi-contacts-19.04.50:5 <kde-apps/akonadi-notes-19.04.50:5 <kde-apps/akonadi-search-19.04.50:5 <kde-apps/kcalcore-19.04.50:5 <kde-apps/kcontacts-19.04.50:5 <kde-apps/kidentitymanagement-19.04.50:5 <kde-apps/kldap-19.04.50:5 <kde-apps/kmime-19.04.50:5 <kde-apps/kontactinterface-19.04.50:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-misc/zanshin:4 <kde-apps/kdepim-runtime-19.04.50:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f0f90a4194258a9376f5cb8defee3836 diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz Binary files differindex 04a7bb2cb1c8..0be8131dc6fa 100644 --- a/metadata/md5-cache/kde-plasma/Manifest.gz +++ b/metadata/md5-cache/kde-plasma/Manifest.gz diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.16.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.16.5 index 987988db0420..849f952ca6e7 100644 --- a/metadata/md5-cache/kde-plasma/bluedevil-5.16.5 +++ b/metadata/md5-cache/kde-plasma/bluedevil-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/bluedevil-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d9758680037aeee292637da9e09b2c1c diff --git a/metadata/md5-cache/kde-plasma/breeze-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-5.16.5 index 96988e0fb39d..ea28d3c39723 100644 --- a/metadata/md5-cache/kde-plasma/breeze-5.16.5 +++ b/metadata/md5-cache/kde-plasma/breeze-5.16.5 @@ -11,5 +11,9 @@ PDEPEND=>=kde-frameworks/breeze-icons-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.5 RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bee6b297b26d94d545e6df0fcfdd5235 diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5 index 903c07257321..5455446d3955 100644 --- a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5 +++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5 @@ -8,5 +8,9 @@ KEYWORDS=amd64 ~arm arm64 x86 LICENSE=GPL-3+ SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-grub-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1afbe98fc67b17e83e163e73230718b7 diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5 index b317f78e6c65..db4f00441036 100644 --- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5 +++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-gtk-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8f231defd80fec3a0d5d1fec88f7e696 diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5 index 0f35911a7bf2..e0bcf635a3c3 100644 --- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5 +++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ GPL-3+ RDEPEND=sys-boot/plymouth SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-plymouth-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5b54e26bc993131072e83eecc844cfc5 diff --git a/metadata/md5-cache/kde-plasma/discover-5.16.5 b/metadata/md5-cache/kde-plasma/discover-5.16.5 index 1bfcd96bf0d4..7a45348eb7f2 100644 --- a/metadata/md5-cache/kde-plasma/discover-5.16.5 +++ b/metadata/md5-cache/kde-plasma/discover-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/discover-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c89cdf197952885c62e14c7b1f7d314d diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.16.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.16.5 index a55cf3300148..6735dff3c39a 100644 --- a/metadata/md5-cache/kde-plasma/drkonqi-5.16.5 +++ b/metadata/md5-cache/kde-plasma/drkonqi-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/drkonqi-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6ec8bd1b5fdb12fedfd9c46759c13975 diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5 index 3e2cba9cbde4..a914e549d129 100644 --- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5 @@ -10,5 +10,9 @@ LICENSE=|| ( GPL-2 GPL-3 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kactivitymanagerd-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=80dff0dfb36ec7aa42e8651ab77beed0 diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5 index f9c9067431d7..9b008f762457 100644 --- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5 @@ -12,5 +12,9 @@ REQUIRED_USE=kdesu? ( X ) RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kde-cli-tools-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=646f5dea3b810875e3280bc5dbbce071 diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5 index 8437875734ed..b935e478a5a6 100644 --- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-3 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kde-gtk-config-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=acda620052b286c0b54b1a8e5d60b334 diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.16.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.16.5 index 4180e41f43a3..68cc536da5c3 100644 --- a/metadata/md5-cache/kde-plasma/kdecoration-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kdecoration-5.16.5 @@ -10,5 +10,9 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kdecoration-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aa7e9a50dc52ffb9457f6a2dde076c9d diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5 index 0ce0fed1f5b9..013fd3693aea 100644 --- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) >=kde-plasma/plasma-workspace-5.16.5:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kdeplasma-addons-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1a9b9c394530b244e978db807e61f946 diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.16.5 b/metadata/md5-cache/kde-plasma/kgamma-5.16.5 index cce52835aaf2..c75728d602a6 100644 --- a/metadata/md5-cache/kde-plasma/kgamma-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kgamma-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kgamma5-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2fc6835920277c8e5eadff23693cd7f8 diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.16.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.16.5 index 40322871fc87..e3412e453204 100644 --- a/metadata/md5-cache/kde-plasma/khotkeys-5.16.5 +++ b/metadata/md5-cache/kde-plasma/khotkeys-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/khotkeys-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=96d8aee249079e652b28da07a289c02b diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5 index f6dbfe6d9861..f3dadd281518 100644 --- a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 REQUIRED_USE=wayland? ( || ( gles2 opengl ) ) SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kinfocenter-5.16.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=997eed69817172edf5a10468b9e30ba6 diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5 index d1f372d65864..ec68d76493fe 100644 --- a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kmenuedit-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=232776e43fe1fef93019f2b46b3c1804 diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.16.5 b/metadata/md5-cache/kde-plasma/kscreen-5.16.5 index b4a75e56c1fc..e4cd9da5961b 100644 --- a/metadata/md5-cache/kde-plasma/kscreen-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kscreen-5.16.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kscreen-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=054473f9122491bf18d7caf889acd29a diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5 index cdcd8535e164..f5106b8559c2 100644 --- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5 @@ -13,5 +13,9 @@ REQUIRED_USE=seccomp? ( pam ) RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kscreenlocker-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2fbef7bf632f15f8debe2f031640a473 diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5 index 8776ed63a00e..2141217c5c53 100644 --- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5 +++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/ksshaskpass-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b697af764a15b51adb2e3c5257318456 diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.16.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.16.5 index 1cd637895a02..6667a9ac8ee2 100644 --- a/metadata/md5-cache/kde-plasma/ksysguard-5.16.5 +++ b/metadata/md5-cache/kde-plasma/ksysguard-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm-sensors? ( sys-apps/lm-sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=830ded4cac54b9a7d9e005f1d8493434 diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5 index 2f44e27501a0..22457773bff9 100644 --- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kwallet-pam-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=629431ed144101f23c237af74de43521 diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5 index 8c126907cff7..f73940907692 100644 --- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 > RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kwayland-integration-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=73e8e88ec909c4e20895c14cc4f2c6a4 diff --git a/metadata/md5-cache/kde-plasma/kwin-5.16.5 b/metadata/md5-cache/kde-plasma/kwin-5.16.5 index 848ca7aa0945..eeddc9cbc27f 100644 --- a/metadata/md5-cache/kde-plasma/kwin-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kwin-5.16.5 @@ -12,5 +12,9 @@ RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >= RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kwin-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6b9928e6aab6105af70a30d388986530 diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.16.5 b/metadata/md5-cache/kde-plasma/kwrited-5.16.5 index 9b3ffebade2d..f03170b2a238 100644 --- a/metadata/md5-cache/kde-plasma/kwrited-5.16.5 +++ b/metadata/md5-cache/kde-plasma/kwrited-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/kwrited-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dde59fecfb0e4d47417630785d36259e diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.16.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.16.5 index db61b0b3ac1a..adf3f9b84665 100644 --- a/metadata/md5-cache/kde-plasma/libkscreen-5.16.5 +++ b/metadata/md5-cache/kde-plasma/libkscreen-5.16.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtg RESTRICT=test SLOT=5/7 SRC_URI=mirror://kde/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=14417310365cae84c949b5d61a7d473c diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.16.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.16.5 index 33caf8ab95d4..11084b6ca9c2 100644 --- a/metadata/md5-cache/kde-plasma/libksysguard-5.16.5 +++ b/metadata/md5-cache/kde-plasma/libksysguard-5.16.5 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/libksysguard-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8c1d4232835f51928c001acc2960570b diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5 index 2ce0dec048b3..17b93302ede5 100644 --- a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5 +++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b27b5f1c26d14cc78c0b8a970c1b034f diff --git a/metadata/md5-cache/kde-plasma/milou-5.16.5 b/metadata/md5-cache/kde-plasma/milou-5.16.5 index 2f0622271ac6..e2592b766302 100644 --- a/metadata/md5-cache/kde-plasma/milou-5.16.5 +++ b/metadata/md5-cache/kde-plasma/milou-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2.1 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/milou-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c22c822afa555b430bf61ad5326c8701 diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.16.5 b/metadata/md5-cache/kde-plasma/oxygen-5.16.5 index 70e3c5390188..91b7ac09a75e 100644 --- a/metadata/md5-cache/kde-plasma/oxygen-5.16.5 +++ b/metadata/md5-cache/kde-plasma/oxygen-5.16.5 @@ -11,5 +11,9 @@ PDEPEND=>=kde-plasma/kde-cli-tools-5.16.5:5 RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/oxygen-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c7f8859471b05c8b53437314c0bbfc1d diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5 index 18095369359e..13bfbbe78c41 100644 --- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-3+ RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-browser-integration-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bc77a98fe33b35c2c2c5d3111132f8fc diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5 index 58712bd79708..ae4c692189f6 100644 --- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.5:5 >=kde-plasma/plasma-workspace-5.16.5:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.12.3:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/qqc2-desktop-style-5.60.0:5 >=kde-plasma/breeze-5.16.5:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-plasma/oxygen-5.16.5:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-desktop-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2171291a370a34142dddad34bc039b1b diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5 index 756274a55ef9..ca624fb90065 100644 --- a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-integration-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=331835a35da48020c7a4e0f9e5f6787a diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5 index 423dc0fd7cde..16bb6e75d434 100644 --- a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 LGPL-2.1 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-nm-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=60a4e4eec5a47a626675e3eb53af7677 diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5 index c7ebe6a7bfe7..126a8ebee091 100644 --- a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-pa-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=986c1523ba16828f42052fc9dc47c3d8 diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5 index 0505194c4727..7a683015e34e 100644 --- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-sdk-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=13e01a2e1da108b9f69786b9dcd3f5af diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5 index 3e6be25aff41..5da7178b932d 100644 --- a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5 @@ -10,5 +10,9 @@ LICENSE=LGPL-3 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-vault-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=324f18e6f8e90176a22aab6c1292875f diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5 index 6df4d9de6add..6a8a2c7b1831 100644 --- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5 @@ -13,5 +13,9 @@ REQUIRED_USE=gps? ( geolocation ) RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=39ee9cceec7916d721a4d33a335fac4e diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5 index f9fb6c934c12..318b31c0cc7e 100644 --- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5 @@ -8,5 +8,9 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 LICENSE=GPL-2 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=267dd90b50f2538abe1ccbd82badb222 diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5 index 05f9209555c8..cb39446acd6f 100644 --- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5 +++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plymouth-kcm-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0efb25140844a41b3e472f9cebc06817 diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5 index 3d46ec389409..37991198a641 100644 --- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5 +++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/polkit-kde-agent-1-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=03b7a54f9badd205de3dae2e279b003a diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.16.5-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.16.5-r1 index d678fb4730d5..184ad533b07b 100644 --- a/metadata/md5-cache/kde-plasma/powerdevil-5.16.5-r1 +++ b/metadata/md5-cache/kde-plasma/powerdevil-5.16.5-r1 @@ -10,5 +10,5 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.5:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) >=kde-plasma/kde-cli-tools-5.16.5:5 >=sys-power/upower-0.9.23 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/powerdevil-5.16.5.tar.xz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=793f45e2c84b93f650c04bc2763f0c8a diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5 index b55ae878b1af..fd59d6d1cace 100644 --- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5 +++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.5:5 x11-misc/sddm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/sddm-kcm-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=514a606ff720a7871299a04c26a6d4f2 diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.16.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.16.5 index 96294cf0462d..b939fe2b0589 100644 --- a/metadata/md5-cache/kde-plasma/systemsettings-5.16.5 +++ b/metadata/md5-cache/kde-plasma/systemsettings-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ed691605a2e23bd5cafad484a379dbba diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.16.5 b/metadata/md5-cache/kde-plasma/user-manager-5.16.5 index 773d09ff49bd..7fc9f8045f0b 100644 --- a/metadata/md5-cache/kde-plasma/user-manager-5.16.5 +++ b/metadata/md5-cache/kde-plasma/user-manager-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/user-manager-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=af4cabf35f35a225f2b95e4b5122184c diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5 index 7124990e1d4b..4263136c1c6d 100644 --- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5 +++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5 @@ -10,5 +10,9 @@ LICENSE=LGPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) screencast? ( sys-apps/xdg-desktop-portal[screencast] ) !screencast? ( sys-apps/xdg-desktop-portal ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/xdg-desktop-portal-kde-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b779e193363a8a1c378296a71699fc19 diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5 index 1c16b1b43e55..912472cbc216 100644 --- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5 +++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0 SLOT=5 SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b9178fd987d97abc249c9d64563d5a9a diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz Binary files differindex 468aa9d93974..ca75354e12f1 100644 --- a/metadata/md5-cache/mail-client/Manifest.gz +++ b/metadata/md5-cache/mail-client/Manifest.gz diff --git a/metadata/md5-cache/mail-client/kube-0.7.0 b/metadata/md5-cache/mail-client/kube-0.7.0 index 633ac6f4b164..71dafd035d8d 100644 --- a/metadata/md5-cache/mail-client/kube-0.7.0 +++ b/metadata/md5-cache/mail-client/kube-0.7.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/breeze-icons-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=https://github.com/KDE/kube/archive/v0.7.0.tar.gz -> kube-0.7.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7d8275c8da6f9876d3d02206ee14f7c9 diff --git a/metadata/md5-cache/mail-client/mutt-1.12.1 b/metadata/md5-cache/mail-client/mutt-1.12.1 index 2670a0af7587..af162b84c8e1 100644 --- a/metadata/md5-cache/mail-client/mutt-1.12.1 +++ b/metadata/md5-cache/mail-client/mutt-1.12.1 @@ -10,5 +10,9 @@ RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) ) vanilla? ( !nntp !notmuch ) SLOT=0 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.12.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.12.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.12.1-patches-r0.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=a0938be8561da3109b84515d83bd80c6 diff --git a/metadata/md5-cache/mail-client/thunderbird-60.9.0 b/metadata/md5-cache/mail-client/thunderbird-60.9.0 index 525a6ec281ab..19a996aec90f 100644 --- a/metadata/md5-cache/mail-client/thunderbird-60.9.0 +++ b/metadata/md5-cache/mail-client/thunderbird-60.9.0 @@ -11,5 +11,9 @@ REQUIRED_USE=wifi? ( dbus ) RESTRICT=!bindist? ( bindist ) SLOT=0 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ar.xpi -> thunderbird-60.9.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ast.xpi -> thunderbird-60.9.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/be.xpi -> thunderbird-60.9.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/bg.xpi -> thunderbird-60.9.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/br.xpi -> thunderbird-60.9.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ca.xpi -> thunderbird-60.9.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/cs.xpi -> thunderbird-60.9.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/cy.xpi -> thunderbird-60.9.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/da.xpi -> thunderbird-60.9.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/de.xpi -> thunderbird-60.9.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/el.xpi -> thunderbird-60.9.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.9.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.9.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.9.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/et.xpi -> thunderbird-60.9.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/eu.xpi -> thunderbird-60.9.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/fi.xpi -> thunderbird-60.9.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/fr.xpi -> thunderbird-60.9.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.9.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.9.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/gd.xpi -> thunderbird-60.9.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/gl.xpi -> thunderbird-60.9.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/he.xpi -> thunderbird-60.9.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/hr.xpi -> thunderbird-60.9.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.9.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/hu.xpi -> thunderbird-60.9.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.9.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/id.xpi -> thunderbird-60.9.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/is.xpi -> thunderbird-60.9.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/it.xpi -> thunderbird-60.9.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ja.xpi -> thunderbird-60.9.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ko.xpi -> thunderbird-60.9.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/lt.xpi -> thunderbird-60.9.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.9.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/nl.xpi -> thunderbird-60.9.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.9.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/pl.xpi -> thunderbird-60.9.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.9.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.9.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/rm.xpi -> thunderbird-60.9.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ro.xpi -> thunderbird-60.9.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/ru.xpi -> thunderbird-60.9.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/si.xpi -> thunderbird-60.9.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/sk.xpi -> thunderbird-60.9.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/sl.xpi -> thunderbird-60.9.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/sq.xpi -> thunderbird-60.9.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/sr.xpi -> thunderbird-60.9.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.9.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/tr.xpi -> thunderbird-60.9.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/uk.xpi -> thunderbird-60.9.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/vi.xpi -> thunderbird-60.9.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.9.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.9.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.9.0/source/thunderbird-60.9.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=de31354583c62e869f75357d9afa46f0 diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz Binary files differindex 38e26d76bbc8..c4b1aadda2e6 100644 --- a/metadata/md5-cache/mail-filter/Manifest.gz +++ b/metadata/md5-cache/mail-filter/Manifest.gz diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz Binary files differindex df1e2e57b79e..a912d0902d37 100644 --- a/metadata/md5-cache/mail-mta/Manifest.gz +++ b/metadata/md5-cache/mail-mta/Manifest.gz diff --git a/metadata/md5-cache/mail-mta/exim-4.92.2 b/metadata/md5-cache/mail-mta/exim-4.92.2 index 667765549f05..b2b1533708b9 100644 --- a/metadata/md5-cache/mail-mta/exim-4.92.2 +++ b/metadata/md5-cache/mail-mta/exim-4.92.2 @@ -11,5 +11,9 @@ RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/l REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ) !ssl? ( !dkim ) SLOT=0 SRC_URI=https://downloads.exim.org/exim4/exim-4.92.2.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.2.tar.xz ) +<<<<<<< HEAD +_eclasses_=db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=3435e7a2795fcec1b536e62f3e2c74fc diff --git a/metadata/md5-cache/mail-mta/mini-qmail-1.06 b/metadata/md5-cache/mail-mta/mini-qmail-1.06 index d832ab9fc8e9..76b61b3ff7cf 100644 --- a/metadata/md5-cache/mail-mta/mini-qmail-1.06 +++ b/metadata/md5-cache/mail-mta/mini-qmail-1.06 @@ -8,5 +8,9 @@ LICENSE=public-domain RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/maildrop !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd SLOT=0 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=b3bbbbb40e093bb595212297f1c8e665 diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r2 b/metadata/md5-cache/mail-mta/netqmail-1.06-r2 index 720c04ca47d8..d93a4e7b027f 100644 --- a/metadata/md5-cache/mail-mta/netqmail-1.06-r2 +++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r2 @@ -11,5 +11,9 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume ) RESTRICT=test SLOT=0 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=97e389073827ac0945b2b1b1d56f3555 diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r4 b/metadata/md5-cache/mail-mta/netqmail-1.06-r4 index 912a987f58a6..385445ed593c 100644 --- a/metadata/md5-cache/mail-mta/netqmail-1.06-r4 +++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r4 @@ -11,5 +11,9 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume ) RESTRICT=test SLOT=0 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=9ebc01dc55b4895c1f103b223605512a diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r6 b/metadata/md5-cache/mail-mta/netqmail-1.06-r6 index bcd6cdd0fde5..d44fc3d69275 100644 --- a/metadata/md5-cache/mail-mta/netqmail-1.06-r6 +++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r6 @@ -11,5 +11,9 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume ) RESTRICT=test SLOT=0 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=68935c854bfcfd1359e05be94836b0ad diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r7 b/metadata/md5-cache/mail-mta/netqmail-1.06-r7 index e11fa3cf73e4..b9e110948388 100644 --- a/metadata/md5-cache/mail-mta/netqmail-1.06-r7 +++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r7 @@ -11,5 +11,9 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume ) RESTRICT=test SLOT=0 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=e0aee100b4eb9219115aed05ee0d34f1 diff --git a/metadata/md5-cache/mail-mta/postfix-3.4.7 b/metadata/md5-cache/mail-mta/postfix-3.4.7 index c422cd55754d..b85aeda35742 100644 --- a/metadata/md5-cache/mail-mta/postfix-3.4.7 +++ b/metadata/md5-cache/mail-mta/postfix-3.4.7 @@ -11,5 +11,9 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb REQUIRED_USE=ldap-bind? ( ldap sasl ) SLOT=0 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.4.7.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=72849b1a29f08932e795e73dc3ee7686 diff --git a/metadata/md5-cache/mail-mta/postfix-3.5_pre20190922 b/metadata/md5-cache/mail-mta/postfix-3.5_pre20190922 index a0c616e02589..edba9ef761e5 100644 --- a/metadata/md5-cache/mail-mta/postfix-3.5_pre20190922 +++ b/metadata/md5-cache/mail-mta/postfix-3.5_pre20190922 @@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb REQUIRED_USE=ldap-bind? ( ldap sasl ) SLOT=0 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.5-20190922.tar.gz -_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=4b854376b31a3887064a26f3b3e37cfe diff --git a/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8 b/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8 index d81f1a94c2fe..92a5cf9dd647 100644 --- a/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8 +++ b/metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8 @@ -10,5 +10,9 @@ RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !m RESTRICT=test SLOT=0 SRC_URI=mirror://qmail/qmail-1.03.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.nrg4u.com/qmail/qmail-ldap-1.03-20060201.patch.gz mirror://gentoo/qmail-ldap-1.03-20060201-controls20060401d.patch mirror://gentoo/qmail-ldap-1.03-queue-custom-error.patch !vanilla? ( qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz mirror://gentoo/qmail-ldap-1.03-spp-0.42.patch ) ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=b3fa6a9d4941a3ffc854beaaaf22d5fa diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz Binary files differindex 01283a3744cf..51a9d39adcff 100644 --- a/metadata/md5-cache/media-fonts/Manifest.gz +++ b/metadata/md5-cache/media-fonts/Manifest.gz diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.5 b/metadata/md5-cache/media-fonts/encodings-1.0.5 index 38450a9c6622..10b7cc0be41f 100644 --- a/metadata/md5-cache/media-fonts/encodings-1.0.5 +++ b/metadata/md5-cache/media-fonts/encodings-1.0.5 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8 LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=85cd5113da173188fe8946d137838b06 diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1 index 75d1d83a6328..f92d3a59a014 100644 --- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=c9778be04cc35d96a5d627468e7a1f01 diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1 index 4707bc7838ee..7d3f1d09abec 100644 --- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=c9778be04cc35d96a5d627468e7a1f01 diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1 index 8a19cb3833d0..25f5bb833948 100644 --- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1 +++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ae3a4166bc247d9480eb7696a3672545 diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1 index 9684c793286a..3a8a708eeac8 100644 --- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1 +++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ae3a4166bc247d9480eb7696a3672545 diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1 index 2c554b578b87..05fa42a83905 100644 --- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1 +++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=27ea037cdd2342eab9385b690f8102c7 diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 index b18d4faa6c24..6884faaf1a76 100644 --- a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8 LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5b95d0dadf3756149137da7a2097b39d diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1 index 9f744ecb7fff..8068973b78dc 100644 --- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5d5856229e28e2012c0307faea9b3620 diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1 index a3678c20521c..669fd870ee51 100644 --- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=4f1cba397fed8685f47a64d5a903fe1f diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1 index eb4275ba06de..da621475cd64 100644 --- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=4f1cba397fed8685f47a64d5a903fe1f diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1 index 650eb0092b72..8d03df43b5e5 100644 --- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=2bf40844b7d05a86a34416fca354fc4d diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1 index 843b4c6c1794..e41e312253ca 100644 --- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=2bf40844b7d05a86a34416fca354fc4d diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1 index b28346d5e5af..e3429b9cf684 100644 --- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=4d614eb148a230527c800a374dd39fa4 diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1 index e1cc02059878..37bcd2193316 100644 --- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d8d89f97a245d4600547bfb9102d93b5 diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1 index aff1a3fbcda4..8c6cc4c30abf 100644 --- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=35f8527c27be150e2c5775409938e4a9 diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1 index 78577764fd75..2a4a8f6922f1 100644 --- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=35f8527c27be150e2c5775409938e4a9 diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1 index a70bdb2240dd..0c8ac19792e1 100644 --- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1 +++ b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=72a43958323d8b975fc67008a57fe9bf diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1 index d106f34668f2..c72b2c7b281d 100644 --- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=15be60cc60dc5b3c524a2573a4aa994d diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1 index 1b244573d5aa..6770fe782f9b 100644 --- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=a95b219b38cc075b7675e179d5c34abd diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1 index 50f47fa1c99d..71abc725e1a4 100644 --- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=957b1b387908a6e58f9ea2eeb0dabb8c diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1 index af3ca3f5e8a0..ce30ea5da255 100644 --- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=f0a9a4a1a9d0b69ce99ef4a22df3751b diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1 index e1cfc54df20e..9d14ae5d19ed 100644 --- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=cc1f978a048d1cf7b922b41f17a028b7 diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1 index 6e65488bc90f..1adb43ed5634 100644 --- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5f7cf564581cd91db3d6c3c1c63ca30e diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1 index 4770bfabd01d..dfb2e40e94ed 100644 --- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=7a2f15a9ad1a0dc39f717eaaec98702a diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1 index ce5f1a444815..e27740475cdb 100644 --- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=50ea35f313dafa4c76c66bf99c2703cd diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1 index 30ba8109d9d9..63272bad3f80 100644 --- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=15489ae434af97dc3880acbbcb962e89 diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1 index 00a25ee980b7..869d6901abd6 100644 --- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=c51f40553ff944dedd6563e30bc4a7bf diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1 index 8c24c2b9f016..655a3b4f0f32 100644 --- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=1a81dc5e787a12080eb3021e6bc9ce38 diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1 index 4595bfbcc53c..be1ea398157a 100644 --- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=34787c514e875ff3fb5d00e349193aa7 diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1 index 905b00b3a89b..0785317aa387 100644 --- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1 +++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5b901873cd87ea80293959cf222c09d9 diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1 index 46fb65fa6558..3afb34ad71a3 100644 --- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=764bfe5c3acbe9c8f3ad34cf6356ce9b diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1 index 7139b961df63..3e58c251e969 100644 --- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1 +++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=6372bb65b6e558bd35f345120deebcbb diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1 index e0900b876559..3f9c17cc4372 100644 --- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1 +++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ff79ae1084e48d16de742917574ecc5c diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1 index 887699013d9e..a42b520ae98d 100644 --- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d773b56607759eb5dfa1acc1da0b3f40 diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1 index c1b0ffd02e30..c65be571f24e 100644 --- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=07de938c9de126cc5c0614ad839a1514 diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.2-r1 b/metadata/md5-cache/media-fonts/font-util-1.3.2-r1 index 839f75f4c018..3e0cde251c7e 100644 --- a/metadata/md5-cache/media-fonts/font-util-1.3.2-r1 +++ b/metadata/md5-cache/media-fonts/font-util-1.3.2-r1 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=b650aaa51a8aa64819bac18d290a95c8 diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1 index 1b37842b02a2..0c9569ff3ab8 100644 --- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1 +++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ae25c08e35c2c433d1eb6209735e7ce6 diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1 index 5fc54ed59d5b..dedae3bad780 100644 --- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1 +++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1 @@ -10,5 +10,9 @@ PDEPEND=media-fonts/font-alias RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0 SLOT=0 SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=20659721c703946c77399a98914f72c3 diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 index 599a235344a2..83ca339a2889 100644 --- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 +++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 @@ -8,5 +8,9 @@ KEYWORDS=amd64 ~arm x86 LICENSE=OFL-1.1 SLOT=5 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c893d7400b2a58e8d303cf58232f583f diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1 index a48d1bb4edae..26ed5c129aed 100644 --- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1 +++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1 @@ -8,5 +8,9 @@ KEYWORDS=~amd64 ~arm ~x86 LICENSE=OFL-1.1 SLOT=5 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca font ad294a9d8ad2062ab60ec9d97079eaa0 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 font ad294a9d8ad2062ab60ec9d97079eaa0 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=db35da20a961c9f29d1f7f8351ae15c0 diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz Binary files differindex 2a0e23882bed..bc8c2cfd4fd0 100644 --- a/metadata/md5-cache/media-gfx/Manifest.gz +++ b/metadata/md5-cache/media-gfx/Manifest.gz diff --git a/metadata/md5-cache/media-gfx/darktable-2.6.2 b/metadata/md5-cache/media-gfx/darktable-2.6.2 index c92f395195f9..c21f7d7825b4 100644 --- a/metadata/md5-cache/media-gfx/darktable-2.6.2 +++ b/metadata/md5-cache/media-gfx/darktable-2.6.2 @@ -10,5 +10,9 @@ LICENSE=GPL-3 CC-BY-3.0 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) SLOT=0 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.6.2/darktable-2.6.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/darktable-2.6.2-gcc9.patch.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.6.0/darktable-usermanual.pdf -> darktable-usermanual-2.6.0.pdf ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9cfd1ad577cd19d71811b650219ecf71 diff --git a/metadata/md5-cache/media-gfx/digikam-6.2.0 b/metadata/md5-cache/media-gfx/digikam-6.2.0 index 442e4f50f4b9..610e2660f498 100644 --- a/metadata/md5-cache/media-gfx/digikam-6.2.0 +++ b/metadata/md5-cache/media-gfx/digikam-6.2.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/digikam/6.2.0/digikam-6.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=71a1f3e5cfcd24c01dd1afb1be072996 diff --git a/metadata/md5-cache/media-gfx/digikam-6.3.0 b/metadata/md5-cache/media-gfx/digikam-6.3.0 index 324ff781947b..194916c78454 100644 --- a/metadata/md5-cache/media-gfx/digikam-6.3.0 +++ b/metadata/md5-cache/media-gfx/digikam-6.3.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/digikam/6.3.0/digikam-6.3.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=40550643f53c32d60ca5cf84b0b28b5b diff --git a/metadata/md5-cache/media-gfx/iscan-2.30.4.2 b/metadata/md5-cache/media-gfx/iscan-2.30.4.2 index a3d9fd70873f..cc9dfbf0c910 100644 --- a/metadata/md5-cache/media-gfx/iscan-2.30.4.2 +++ b/metadata/md5-cache/media-gfx/iscan-2.30.4.2 @@ -12,5 +12,9 @@ REQUIRED_USE=gimp? ( X ) RESTRICT=test SLOT=0 SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.4-2.tar.gz doc? ( https://dev.gentoo.org/~flameeyes/avasys/userg_revQ_e.pdf l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/userg_revQ_j.pdf ) ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=ba66325e1dab48adc31e5768619d4a4f diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1 index 8bd0ed8ba010..e2adc8a6858b 100644 --- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1 +++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0 >=kde-frameworks/kcompletion-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kconfigwidgets-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kdelibs4support-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/kio-5.60.0 >=kde-frameworks/ktextwidgets-5.60.0 >=kde-frameworks/kwidgetsaddons-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !media-gfx/kcoloredit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=https://github.com/KDE/kcoloredit/archive/50ac0509891343bc01a0aeffda5a44a1e65d9d04.tar.gz -> kcoloredit-2.0.0_p20171121.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2b49959e26465793cf86069a47ad2a89 diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1 index d570907b93c3..b69fd7c143b4 100644 --- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1 +++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3908e54b1b7d19c8a2a933554b198c20 diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.5 b/metadata/md5-cache/media-gfx/kphotoalbum-5.5 index bd4d6c0e1c56..5a866bc31ef0 100644 --- a/metadata/md5-cache/media-gfx/kphotoalbum-5.5 +++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ FDL-1.2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-19.04.3:5 ) map? ( >=kde-apps/libkgeomap-19.04.3:5 ) raw? ( >=kde-apps/libkdcraw-19.04.3:5 ) media-video/ffmpeg kipi? ( kde-apps/kipi-plugins:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kphotoalbum/5.5/kphotoalbum-5.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0b96ceaf87e649fe7814bce39886d913 diff --git a/metadata/md5-cache/media-gfx/krita-4.1.8-r1 b/metadata/md5-cache/media-gfx/krita-4.1.8-r1 index 4112b813f2ec..7abebdc2b2a3 100644 --- a/metadata/md5-cache/media-gfx/krita-4.1.8-r1 +++ b/metadata/md5-cache/media-gfx/krita-4.1.8-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/krita/4.1.8/krita-4.1.8.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6f1fc9d300ad12bda25a370a1e9a70d4 diff --git a/metadata/md5-cache/media-gfx/krita-4.2.6 b/metadata/md5-cache/media-gfx/krita-4.2.6 index 944e89c6d8fb..7c1ae38ffe76 100644 --- a/metadata/md5-cache/media-gfx/krita-4.2.6 +++ b/metadata/md5-cache/media-gfx/krita-4.2.6 @@ -12,5 +12,9 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/krita/4.2.6/krita-4.2.6.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aa921f8ef83ffc89d64d808131d086d4 diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r2 b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r2 index 7e0b88d741cf..c0359c66a609 100644 --- a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r2 +++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kuickshow/0.10.0/kuickshow-0.10.0.tar.xz -> kuickshow-0.10.0-r1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9f364f0b06e7990f7e97770d097f557d diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.2.0 b/metadata/md5-cache/media-gfx/kxstitch-2.2.0 index 213ea3202789..1a601939fc46 100644 --- a/metadata/md5-cache/media-gfx/kxstitch-2.2.0 +++ b/metadata/md5-cache/media-gfx/kxstitch-2.2.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kxstitch/2.2.0/kxstitch-2.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=911699db15779795b524ed79bed50a4c diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0 b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0 index 9d0b8b2a7aed..aaaa597c3a40 100644 --- a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0 +++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/ilmbase:= media-libs/lcms:2 media-libs/libpng:0= media-libs/libraw:= media-libs/openexr:= media-libs/tiff:0 sci-libs/fftw:3.0=[threads] sci-libs/gsl:= virtual/jpeg:0 fits? ( sci-libs/cfitsio:= ) SLOT=0 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.6.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=919fe07f80c1a593650dc62866338c5f diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0 b/metadata/md5-cache/media-gfx/povray-3.7.0.0 index 00f7a5d0a3a9..efe49342410b 100644 --- a/metadata/md5-cache/media-gfx/povray-3.7.0.0 +++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0 @@ -9,5 +9,9 @@ LICENSE=AGPL-3 RDEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg mkl? ( sci-libs/mkl ) openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) SLOT=0 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 +>>>>>>> next _md5_=ddbfa77960b2570a096c8ef8bdab8681 diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.1.0 b/metadata/md5-cache/media-gfx/symboleditor-2.1.0 index f4486e9c96cf..9485efa9a2a4 100644 --- a/metadata/md5-cache/media-gfx/symboleditor-2.1.0 +++ b/metadata/md5-cache/media-gfx/symboleditor-2.1.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/symboleditor/2.1.0/symboleditor-2.1.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e496eb26637612130f105f70a0cd674f diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz Binary files differindex e9ea7b63a51e..783091294d9e 100644 --- a/metadata/md5-cache/media-libs/Manifest.gz +++ b/metadata/md5-cache/media-libs/Manifest.gz diff --git a/metadata/md5-cache/media-libs/coin-3.1.3-r2 b/metadata/md5-cache/media-libs/coin-3.1.3-r2 index 8725d44f54bc..d723655e71e9 100644 --- a/metadata/md5-cache/media-libs/coin-3.1.3-r2 +++ b/metadata/md5-cache/media-libs/coin-3.1.3-r2 @@ -9,5 +9,9 @@ LICENSE=|| ( GPL-2 PEL ) RDEPEND=dev-libs/expat media-libs/fontconfig media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext bzip2? ( app-arch/bzip2 ) javascript? ( dev-lang/spidermonkey:0 ) openal? ( media-libs/openal ) simage? ( media-libs/simage ) zlib? ( sys-libs/zlib ) SLOT=0 SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/Coin-3.1.3.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=a47057aa68ac42a73b8c41530b47335b diff --git a/metadata/md5-cache/media-libs/freeglut-3.2.0 b/metadata/md5-cache/media-libs/freeglut-3.2.0 index b820e76daf4a..72cd1113eb00 100644 --- a/metadata/md5-cache/media-libs/freeglut-3.2.0 +++ b/metadata/md5-cache/media-libs/freeglut-3.2.0 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=virtual/glu-9.0-r1[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(-)?] >=virtual/opengl-7.0-r1[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libXxf86vm-1.1.3[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(-)?] SLOT=0 SRC_URI=mirror://sourceforge/freeglut/freeglut-3.2.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=da50ba20ae2c9823ad3b20f0621c6e78 diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.1 b/metadata/md5-cache/media-libs/harfbuzz-2.6.1 index a5c756d889d9..b5951b5e3cf2 100644 --- a/metadata/md5-cache/media-libs/harfbuzz-2.6.1 +++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.1 @@ -11,5 +11,9 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-) REQUIRED_USE=introspection? ( glib ) SLOT=0/0.9.18 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.1.tar.xz +<<<<<<< HEAD +_eclasses_=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 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=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 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=89684fa290cceae78db84e60c63d47f8 diff --git a/metadata/md5-cache/media-libs/libglvnd-1.1.1-r1 b/metadata/md5-cache/media-libs/libglvnd-1.1.1-r1 new file mode 100644 index 000000000000..e0392389de15 --- /dev/null +++ b/metadata/md5-cache/media-libs/libglvnd-1.1.1-r1 @@ -0,0 +1,14 @@ +BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) !media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.0_rc1 x11-libs/libX11[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(-)?] +DESCRIPTION=The GL Vendor-Neutral Dispatch library +EAPI=7 +HOMEPAGE=https://github.com/NVIDIA/libglvnd +IUSE=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 +KEYWORDS=~amd64 +LICENSE=MIT +RDEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.0_rc1 x11-libs/libX11[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(-)?] +SLOT=0 +SRC_URI=https://github.com/NVIDIA/libglvnd/releases/download/v1.1.1/libglvnd-1.1.1.tar.gz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=c31b300cfba24b265c77c8476515e50e diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1 index 0be7a3dd99f4..e27c335fa823 100644 --- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1 +++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-0.4.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=357b3f3453b717efc5d4000ddd2713c3 diff --git a/metadata/md5-cache/media-libs/mesa-19.2.0_rc4 b/metadata/md5-cache/media-libs/mesa-19.2.0_rc4 new file mode 100644 index 000000000000..da916fcc28b0 --- /dev/null +++ b/metadata/md5-cache/media-libs/mesa-19.2.0_rc4 @@ -0,0 +1,16 @@ +BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 +DEFINED_PHASES=compile configure install postinst pretend setup test +DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[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(-)?] ) video_cards_r600? ( virtual/libelf:0=[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(-)?] ) video_cards_radeon? ( virtual/libelf:0=[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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,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(-)?] dev-libs/libclc virtual/libelf:0=[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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[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(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[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(-)?] >=x11-libs/libXext-1.3.2:=[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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?] sys-devel/clang:9[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(-)?] sys-devel/clang:8[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(-)?] sys-devel/clang:7[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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?] sys-devel/llvm:9[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(-)?] sys-devel/llvm:8[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(-)?] sys-devel/llvm:7[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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[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(-)?] x11-base/xorg-proto ) +DESCRIPTION=OpenGL-like graphic library for Linux +EAPI=7 +HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/ +IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[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(-)?] ) video_cards_r600? ( virtual/libelf:0=[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(-)?] ) video_cards_radeon? ( virtual/libelf:0=[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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,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(-)?] dev-libs/libclc virtual/libelf:0=[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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[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(-)?] >=x11-libs/libxshmfence-1.1:=[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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[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(-)?] >=x11-libs/libXext-1.3.2:=[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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] x11-libs/libXfixes:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?] sys-devel/clang:9[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(-)?] sys-devel/clang:8[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(-)?] sys-devel/clang:7[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(-)?] ) sys-devel/clang:=[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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?] sys-devel/llvm:9[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(-)?] sys-devel/llvm:8[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(-)?] sys-devel/llvm:7[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(-)?] ) sys-devel/llvm:=[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(-)?] ) ) ) ) ) +REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.2.0-rc4.tar.xz +_eclasses_=llvm 5dbc14df2333105b7c006124ead9bf3f meson b5ee7a05833ab91225acf30ffdeed006 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=c4faa30ddccfe816339d2965644fc2ce diff --git a/metadata/md5-cache/media-libs/phonon-4.11.0 b/metadata/md5-cache/media-libs/phonon-4.11.0 new file mode 100644 index 000000000000..28edc8f915bc --- /dev/null +++ b/metadata/md5-cache/media-libs/phonon-4.11.0 @@ -0,0 +1,15 @@ +BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 +DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack +DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 +DESCRIPTION=KDE multimedia abstraction library +EAPI=7 +HOMEPAGE=https://phonon.kde.org/ +IUSE=debug designer gstreamer pulseaudio +vlc debug +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd +LICENSE=|| ( LGPL-2.1 LGPL-3 ) +PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 ) vlc? ( >=media-libs/phonon-vlc-0.9.60 ) +RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 +SLOT=0 +SRC_URI=mirror://kde/stable/phonon/4.11.0/phonon-4.11.0.tar.xz +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=040d3df31043db757f70d32a66e1c28b diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 index f0b2e2ae588a..634aa5078c81 100644 --- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 +++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 ) RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.10.0/phonon-backend-gstreamer-4.10.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f40573ed67efbaa6ec5942cdbe2c6106 diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.11.0 b/metadata/md5-cache/media-libs/phonon-vlc-0.11.0 new file mode 100644 index 000000000000..78f2d4590fd7 --- /dev/null +++ b/metadata/md5-cache/media-libs/phonon-vlc-0.11.0 @@ -0,0 +1,14 @@ +BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 +DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack +DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 +DESCRIPTION=VLC backend for the Phonon multimedia library +EAPI=7 +HOMEPAGE=https://phonon.kde.org/ +IUSE=debug debug +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 +LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 ) +RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 +SLOT=0 +SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.11.0/phonon-backend-vlc-0.11.0.tar.xz +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=2b969e18fbf7bb231c25f141bbb6013a diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.114 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.114 index 6174f938b13e..e351363ff220 100644 --- a/metadata/md5-cache/media-libs/vulkan-loader-1.1.114 +++ b/metadata/md5-cache/media-libs/vulkan-loader-1.1.114 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0 PDEPEND=layers? ( media-libs/vulkan-layers:=[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(-)?] ) SLOT=0 SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/1bb7f68564fe565de2927071c79008bd6ede5af5.tar.gz -> vulkan-loader-1.1.114.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c53f6d906a5772ae42f7e105587d64bf diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz Binary files differindex e13ba2588c55..af34d96f9fd8 100644 --- a/metadata/md5-cache/media-plugins/Manifest.gz +++ b/metadata/md5-cache/media-plugins/Manifest.gz diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2 index 0286a000142e..8fef42169506 100644 --- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2 +++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* >=media-libs/libmodplug-0.8.9.0 SLOT=0 SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.2.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=90737da0d34f51785fd627fda0958828 diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 index 0a1b5f99c716..4dad55a7feda 100644 --- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 +++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 >=media-libs/libmodplug-0.8.9.0 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=01cd5df9cac05f613b19348764c35b20 diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1 index 4e5b8f4a1834..f598e4cb125c 100644 --- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1 +++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* SLOT=0 SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-nosefart-2.0.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d7791f38d00d8791e24980e9ddf0cb34 diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 index 0c0b54f9eb73..6f6cc781505c 100644 --- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 +++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7f25b5a7f5445d06e38d1a022c98172f diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2 index 5c43cf694976..277f8fdd059b 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac SLOT=0 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.2-Leia.tar.gz -> kodi-audioencoder-flac-2.0.2.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0b794d8772c204bc775668ea9afd3192 diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 index ec3c9899f791..dff2f775279f 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.4 media-libs/flac SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1d0dfd783b2cee9dd20b6c753dd8a10e diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2 index 0e9bd9dd0b79..5e6c60f6d038 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* >=media-sound/lame-3.100 SLOT=0 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/2.0.2-Leia.tar.gz -> kodi-audioencoder-lame-2.0.2.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=88e2fecd42db4c0301f33dde79712c3a diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 index 435c2740c124..cfa5341c60aa 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 >=media-sound/lame-3.100 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b12c02bd86fca0df9899afca083b3142 diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3 index 9f1ad56741ed..d702a834e018 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6 SLOT=0 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/2.0.3-Leia.tar.gz -> kodi-audioencoder-vorbis-2.0.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fa2f335f6d94f31c14c4bf4251b6a550 diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 index c1f565cde1c2..12d2a03ec416 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9cc565e8f2212be7217d019e53eb127d diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2 index a16f5cb0fa04..daa2871e67d2 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* SLOT=0 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/2.0.2-Leia.tar.gz -> kodi-audioencoder-wav-2.0.2.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aa10ef6a1524a1392e4d496b22c8bf5b diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 index 4aa535398669..54d17ba2c4ac 100644 --- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 +++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8e03dfd543649a70f21b77f14b519741 diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3 index ab08815dbd3c..ed81215cbc86 100644 --- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3 +++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml SLOT=0 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/3.8.3-Leia.tar.gz -> kodi-pvr-iptvsimple-3.8.3.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ce40e60ea1903bf71b3f6e556f5c82bc diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10 index 3833c06227c3..a198a6203362 100644 --- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10 +++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp dev-libs/tinyxml SLOT=0 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/3.4.10-Leia.tar.gz -> kodi-pvr-stalker-3.4.10.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d1e82ed5fe7fcc074ae72452fbf761ee diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 index 1e2106bd8566..0c754852cb10 100644 --- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 +++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp dev-libs/tinyxml SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8a8b77de5e7054277cb7f6ff5f7f1d5e diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1 index a1a5630d01d9..85dfcf8894d4 100644 --- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1 +++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json SLOT=0 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.28.1-Leia.tar.gz -> kodi-pvr-vuplus-3.28.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4bdd76444922e3cafb667aafb29c5ba6 diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 index 9ed509ec3b29..147f5b88ec6b 100644 --- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 +++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml dev-cpp/nlohmann_json SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=983e866e7e506a656e1d1a9520a7f3c6 diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5 index b153116a9d7d..363ab3f8bddd 100644 --- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5 +++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* SLOT=0 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/2.4.5-Leia.tar.gz -> kodi-pvr-wmc-2.4.5.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9dc0ecd65206ee1c6c1b41040bdf51e3 diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1 index 27ec07ca2e0c..5defac72d0a9 100644 --- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1 +++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND==media-tv/kodi-18* virtual/opengl media-libs/glm SLOT=0 SRC_URI=https://github.com/notspiff/visualization.fishbmc/archive/5.1.1-Leia.tar.gz -> kodi-visualization-fishbmc-5.1.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7dd5741bb53811dcdad9fe8d00eb09bf diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 index 1004de283f27..29c44d879c7d 100644 --- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 +++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=~media-tv/kodi-9999 virtual/opengl media-libs/glm SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=53d9532335c583e3a530356e2b4e94aa diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz Binary files differindex 720599e6fee8..2f4246a6fc04 100644 --- a/metadata/md5-cache/media-sound/Manifest.gz +++ b/metadata/md5-cache/media-sound/Manifest.gz diff --git a/metadata/md5-cache/media-sound/ardour-5.12 b/metadata/md5-cache/media-sound/ardour-5.12 index 36b984742777..eb8888ff60a7 100644 --- a/metadata/md5-cache/media-sound/ardour-5.12 +++ b/metadata/md5-cache/media-sound/ardour-5.12 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 SLOT=6 SRC_URI=mirror://gentoo/Ardour-5.12.0.tar.bz2 -> ardour-5.12.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986 +>>>>>>> next _md5_=68806e45f555c878d774096efb9bcefa diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999 index 0325ff35ba78..76b57a4b6457 100644 --- a/metadata/md5-cache/media-sound/ardour-9999 +++ b/metadata/md5-cache/media-sound/ardour-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 SLOT=6 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986 +>>>>>>> next _md5_=68806e45f555c878d774096efb9bcefa diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20190721 b/metadata/md5-cache/media-sound/audex-0.95_pre20190721 index 9ae2574107b0..9aa6764d1cb1 100644 --- a/metadata/md5-cache/media-sound/audex-0.95_pre20190721 +++ b/metadata/md5-cache/media-sound/audex-0.95_pre20190721 @@ -10,5 +10,9 @@ LICENSE=GPL-3 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/KDE/audex/archive/1389389e7341a749f95b313045f9d0cd809748b4.tar.gz -> audex-0.95_pre20190721.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=297753eaa81790d9c25b14a30b43f58d diff --git a/metadata/md5-cache/media-sound/elisa-0.4.2-r1 b/metadata/md5-cache/media-sound/elisa-0.4.2-r1 index d231bef7ca0a..b5c7aa94242d 100644 --- a/metadata/md5-cache/media-sound/elisa-0.4.2-r1 +++ b/metadata/md5-cache/media-sound/elisa-0.4.2-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/elisa/0.4.2/elisa-0.4.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ac1c4030daab4671fbc0b954b05ac84b diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225 index ac90c21b5439..574972455c51 100644 --- a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225 +++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225 @@ -10,5 +10,9 @@ LICENSE=GPL-2 FDL-1.2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=kde-apps/libkcompactdisc-19.04.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/KDE/kaudiocreator/archive/471cab933bf9e5a299d07e7cb1c0851e31e299f2.tar.gz -> kaudiocreator-1.3_p20190225.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a61a5a6ade96510ebbc899e0c099f42b diff --git a/metadata/md5-cache/media-sound/mpd-0.21.14 b/metadata/md5-cache/media-sound/mpd-0.21.14 index e3dd19e85f9d..9413a847e20b 100644 --- a/metadata/md5-cache/media-sound/mpd-0.21.14 +++ b/metadata/md5-cache/media-sound/mpd-0.21.14 @@ -12,5 +12,9 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.14.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=78cf4497b4c0efea44997a8d4aee313c diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0 b/metadata/md5-cache/media-sound/pulseaudio-13.0 index ea7657aa222e..519a55cf5479 100644 --- a/metadata/md5-cache/media-sound/pulseaudio-13.0 +++ b/metadata/md5-cache/media-sound/pulseaudio-13.0 @@ -11,5 +11,9 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) ) SLOT=0 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ad36c125d9e9e664619a09bf2a701dfb diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2 index 9cbff4db18fc..be9a91475ae2 100644 --- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2 +++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia !media-sound/soundkonverter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/dfaust/soundkonverter/archive/v3.0.1.tar.gz -> soundkonverter-3.0.1.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dcf9e2ff7ce9c737a42943f0966f795a diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz Binary files differindex e393de827d4d..658cca95b35e 100644 --- a/metadata/md5-cache/media-tv/Manifest.gz +++ b/metadata/md5-cache/media-tv/Manifest.gz diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999 index 0b81d361f382..d09532e0657a 100644 --- a/metadata/md5-cache/media-tv/kodi-9999 +++ b/metadata/md5-cache/media-tv/kodi-9999 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libress REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) SLOT=0 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=adcb7fba7222d9904459493bdc4e11a2 diff --git a/metadata/md5-cache/media-tv/mythtv-30.0_p20190808 b/metadata/md5-cache/media-tv/mythtv-30.0_p20190808 index 72dd37a3bdd1..ccecc1664154 100644 --- a/metadata/md5-cache/media-tv/mythtv-30.0_p20190808 +++ b/metadata/md5-cache/media-tv/mythtv-30.0_p20190808 @@ -12,5 +12,9 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) bluray? ( xml ) cdr? ( cdda ) RESTRICT=test SLOT=0/30.0_p20190808 SRC_URI=https://github.com/MythTV/mythtv/archive/5cde0578d84926171b20c8f7e95a101e9b0b9457.tar.gz -> mythtv-30.0_p20190808.tar.gz +<<<<<<< HEAD +_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd +======= _eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd +>>>>>>> next _md5_=e9058306adfc39219b5b8ce97233fe73 diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz Binary files differindex e90422738e5a..f2f24faa3ccb 100644 --- a/metadata/md5-cache/media-video/Manifest.gz +++ b/metadata/md5-cache/media-video/Manifest.gz diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.1 b/metadata/md5-cache/media-video/ffmpeg-4.2.1 index 8248dd179148..2fa175cad5a0 100644 --- a/metadata/md5-cache/media-video/ffmpeg-4.2.1 +++ b/metadata/md5-cache/media-video/ffmpeg-4.2.1 @@ -12,5 +12,9 @@ REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zli RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) SLOT=0/56.58.58 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=ab000f3cf5d1825c97ba7e184bb5e644 diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.18 b/metadata/md5-cache/media-video/kaffeine-2.0.18 index b690eae13ca5..ba7ed1707f8a 100644 --- a/metadata/md5-cache/media-video/kaffeine-2.0.18 +++ b/metadata/md5-cache/media-video/kaffeine-2.0.18 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 ) RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.18.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bbdb45f676a1bd5b95bdd8506bffff04 diff --git a/metadata/md5-cache/media-video/kamerka-0.20 b/metadata/md5-cache/media-video/kamerka-0.20 index c0f56149898b..1c684017a74f 100644 --- a/metadata/md5-cache/media-video/kamerka-0.20 +++ b/metadata/md5-cache/media-video/kamerka-0.20 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kconfigwidgets-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kdelibs4support-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kio-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kwidgetsaddons-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libv4l media-libs/phonon[qt5(+)] >=media-libs/qimageblitz-0.0.6_p20131029[qt5(+)] >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=0 SRC_URI=https://github.com/dos1/kamerka/archive/0.20.tar.gz -> kamerka-0.20.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a28c67aa4b1e9ca21ab29ce027a3f6d5 diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r2 b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r2 index 95f840bbd495..125b0566596e 100644 --- a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r2 +++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1 RDEPEND=>=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kmediaplayer-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kmplayer//kmplayer-0.12.0b.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cd9673fd3c10cdcbe48abd146fc0d5b8 diff --git a/metadata/md5-cache/media-video/mkvtoolnix-37.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-37.0.0 index 62352cc387c4..c2f2185b1cec 100644 --- a/metadata/md5-cache/media-video/mkvtoolnix-37.0.0 +++ b/metadata/md5-cache/media-video/mkvtoolnix-37.0.0 @@ -5,10 +5,19 @@ DESCRIPTION=Tools to create, alter, and inspect Matroska files EAPI=7 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix IUSE=debug nls pch test qt5 +<<<<<<< HEAD +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +======= KEYWORDS=~amd64 ~ppc ppc64 ~x86 +>>>>>>> next LICENSE=GPL-2 RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= ) SLOT=0 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-37.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=6af63343d07b9c9a92d7ca266b153c57 +======= _eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=dc25ac519cc1e3325681941bafcf609a +>>>>>>> next diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9999 b/metadata/md5-cache/media-video/mkvtoolnix-9999 index 2ccd88907690..02d15d6f1717 100644 --- a/metadata/md5-cache/media-video/mkvtoolnix-9999 +++ b/metadata/md5-cache/media-video/mkvtoolnix-9999 @@ -9,5 +9,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= ) SLOT=0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6af63343d07b9c9a92d7ca266b153c57 diff --git a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 index d2001e5cf809..e4eec2fe68ad 100644 --- a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 +++ b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5 ) >=kde-plasma/plasma-workspace-5.15.5:5 >=dev-qt/qtmultimedia-5.12.3:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/plasma-mediacenter/5.7.5/plasma-mediacenter-5.7.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9be6a27e52a56decf741af1f348e09f8 diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.7.0 b/metadata/md5-cache/media-video/subtitlecomposer-0.7.0 index 68c53bd1a4b1..703b6bdcc361 100644 --- a/metadata/md5-cache/media-video/subtitlecomposer-0.7.0 +++ b/metadata/md5-cache/media-video/subtitlecomposer-0.7.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv[libmpv] ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.7.0.tar.gz -> subtitlecomposer-0.7.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cf79800d7f4f69ffde4bd2e89263fa20 diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz Binary files differindex 2b9b94fccbf9..ab27eb03c2c1 100644 --- a/metadata/md5-cache/net-analyzer/Manifest.gz +++ b/metadata/md5-cache/net-analyzer/Manifest.gz diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401 index b95ce881886a..626b11a4875f 100644 --- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401 +++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg media-libs/giflib media-libs/libpng ) mp3? ( media-sound/mpg123 ) SLOT=0 SRC_URI=https://github.com/downloads/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=99baa923fcf9eed71db66ebaec4acfe2 diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 index 287a30eb000f..5777481067b8 100644 --- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 +++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) mp3? ( media-sound/mpg123 ) SLOT=0 SRC_URI=https://github.com/downloads/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=84105810c4fb45716ec15a5a323dde76 diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.5 b/metadata/md5-cache/net-analyzer/icinga2-2.10.5 index bbe068777454..fba366b61d01 100644 --- a/metadata/md5-cache/net-analyzer/icinga2-2.10.5 +++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.5 @@ -10,5 +10,9 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >= REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) ) SLOT=0 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.10.5.tar.gz -> icinga2-2.10.5.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c5951754df8b2909dec18e7552724e19 diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.6 b/metadata/md5-cache/net-analyzer/icinga2-2.10.6 index b7c4a1ee6262..7c58aff0de6a 100644 --- a/metadata/md5-cache/net-analyzer/icinga2-2.10.6 +++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.6 @@ -10,5 +10,9 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >= REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) ) SLOT=0 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.10.6.tar.gz -> icinga2-2.10.6.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e7c184d11212948e88f2a2085c30f352 diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.11.0 b/metadata/md5-cache/net-analyzer/icinga2-2.11.0 index 66495756945b..dea42bbb5129 100644 --- a/metadata/md5-cache/net-analyzer/icinga2-2.11.0 +++ b/metadata/md5-cache/net-analyzer/icinga2-2.11.0 @@ -10,5 +10,9 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >= REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) ) SLOT=0 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.11.0.tar.gz -> icinga2-2.11.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8dd20a64740441b0205a992268a10904 diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999 index 898d5c4d5fc7..ef820bfeb017 100644 --- a/metadata/md5-cache/net-analyzer/icinga2-9999 +++ b/metadata/md5-cache/net-analyzer/icinga2-9999 @@ -9,5 +9,9 @@ PROPERTIES=live RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.66:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* ) REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=09e59dd6c20ac8b41409325a93d9c9b1 diff --git a/metadata/md5-cache/net-analyzer/nmap-7.70 b/metadata/md5-cache/net-analyzer/nmap-7.70 index 37a6dfba8863..9773808b8f36 100644 --- a/metadata/md5-cache/net-analyzer/nmap-7.70 +++ b/metadata/md5-cache/net-analyzer/nmap-7.70 @@ -10,5 +10,9 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 ) SLOT=0 SRC_URI=https://nmap.org/dist/nmap-7.70.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=6916cdd2c0069d4270ce8cfe42798777 diff --git a/metadata/md5-cache/net-analyzer/nmap-7.80 b/metadata/md5-cache/net-analyzer/nmap-7.80 index 27042d2c4582..932fb7e3d163 100644 --- a/metadata/md5-cache/net-analyzer/nmap-7.80 +++ b/metadata/md5-cache/net-analyzer/nmap-7.80 @@ -11,5 +11,9 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 ) SLOT=0 SRC_URI=https://nmap.org/dist/nmap-7.80.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=95e64f62d5a4b90e67f97aa04e3982a7 diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.3 b/metadata/md5-cache/net-analyzer/wireshark-3.0.3 index 35bd7583e41d..ce9dafb27fd7 100644 --- a/metadata/md5-cache/net-analyzer/wireshark-3.0.3 +++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.3 @@ -11,5 +11,9 @@ RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0/3.0.3 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7886bdcf014ce100ae98aedc0f051d80 diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.4 b/metadata/md5-cache/net-analyzer/wireshark-3.0.4 index fa84a9a12ed1..3e1c135509bd 100644 --- a/metadata/md5-cache/net-analyzer/wireshark-3.0.4 +++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.4 @@ -11,5 +11,9 @@ RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0/3.0.4 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.4.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=af8968268898e4728f14fddc818ebc28 diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.5 b/metadata/md5-cache/net-analyzer/wireshark-3.0.5 index 69fc3bf69544..92506feec305 100644 --- a/metadata/md5-cache/net-analyzer/wireshark-3.0.5 +++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.5 @@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0/3.0.5 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.5.tar.xz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=90ae5a2f3c070c5a34f05a80a883fcc4 diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz Binary files differindex 04d548944f8a..562fc91e7264 100644 --- a/metadata/md5-cache/net-dialup/Manifest.gz +++ b/metadata/md5-cache/net-dialup/Manifest.gz diff --git a/metadata/md5-cache/net-dialup/cutecom-0.51.0 b/metadata/md5-cache/net-dialup/cutecom-0.51.0 index 760f83198410..1472c13399b7 100644 --- a/metadata/md5-cache/net-dialup/cutecom-0.51.0 +++ b/metadata/md5-cache/net-dialup/cutecom-0.51.0 @@ -8,5 +8,9 @@ LICENSE=GPL-3+ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 net-dialup/lrzsz SLOT=0 SRC_URI=https://gitlab.com/cutecom/cutecom/-/archive/v0.51.0/cutecom-v0.51.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=88345fdffb631eee029ca28a8e0a5d68 diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz Binary files differindex cfd04242e4b1..f0a5d5751eae 100644 --- a/metadata/md5-cache/net-dns/Manifest.gz +++ b/metadata/md5-cache/net-dns/Manifest.gz diff --git a/metadata/md5-cache/net-dns/bind-9.14.4 b/metadata/md5-cache/net-dns/bind-9.14.4 index f7d49260bc77..bfb32d9f1253 100644 --- a/metadata/md5-cache/net-dns/bind-9.14.4 +++ b/metadata/md5-cache/net-dns/bind-9.14.4 @@ -12,5 +12,9 @@ REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap RESTRICT=test SLOT=0 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=70ce30dcd49c406f0e88ead9a61127ff diff --git a/metadata/md5-cache/net-dns/bind-9.14.5 b/metadata/md5-cache/net-dns/bind-9.14.5 index f7560b026dbe..55b1cadf6c02 100644 --- a/metadata/md5-cache/net-dns/bind-9.14.5 +++ b/metadata/md5-cache/net-dns/bind-9.14.5 @@ -12,5 +12,9 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz RESTRICT=test SLOT=0 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=690d0dfaca5b73dc2c7c199a7419ba94 diff --git a/metadata/md5-cache/net-dns/bind-9.14.6 b/metadata/md5-cache/net-dns/bind-9.14.6 index d258766fc25e..b2096dea1cf5 100644 --- a/metadata/md5-cache/net-dns/bind-9.14.6 +++ b/metadata/md5-cache/net-dns/bind-9.14.6 @@ -12,5 +12,9 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz RESTRICT=test SLOT=0 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.6/bind-9.14.6.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=690d0dfaca5b73dc2c7c199a7419ba94 diff --git a/metadata/md5-cache/net-dns/bind-9.15.2 b/metadata/md5-cache/net-dns/bind-9.15.2 new file mode 100644 index 000000000000..e7cf3be8490f --- /dev/null +++ b/metadata/md5-cache/net-dns/bind-9.15.2 @@ -0,0 +1,15 @@ +BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DEFINED_PHASES=config configure install postinst prepare setup +DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) +DESCRIPTION=Berkeley Internet Name Domain - Name Server +EAPI=7 +HOMEPAGE=https://www.isc.org/software/bind +IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0 +RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc ) +REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) +RESTRICT=test +SLOT=0 +SRC_URI=https://downloads.isc.org/isc/bind9/9.15.2/bind-9.15.2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +_md5_=10d7b24c2da40610e331f747a384bfc1 diff --git a/metadata/md5-cache/net-dns/bind-9.15.3 b/metadata/md5-cache/net-dns/bind-9.15.3 new file mode 100644 index 000000000000..876d421efb6b --- /dev/null +++ b/metadata/md5-cache/net-dns/bind-9.15.3 @@ -0,0 +1,15 @@ +BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DEFINED_PHASES=config configure install postinst prepare setup +DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) +DESCRIPTION=Berkeley Internet Name Domain - Name Server +EAPI=7 +HOMEPAGE=https://www.isc.org/software/bind +IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0 +RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc ) +REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) +RESTRICT=test +SLOT=0 +SRC_URI=https://downloads.isc.org/isc/bind9/9.15.3/bind-9.15.3.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +_md5_=e1760b565c9ab56be4b5ebd7ccc28ba8 diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.4 b/metadata/md5-cache/net-dns/bind-tools-9.14.4 index 36b1b80bae5e..44b7c5c2fc77 100644 --- a/metadata/md5-cache/net-dns/bind-tools-9.14.4 +++ b/metadata/md5-cache/net-dns/bind-tools-9.14.4 @@ -11,5 +11,9 @@ RDEPEND=!<net-dns/bind-9.10.2 RESTRICT=test SLOT=0 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=62dcebd6353542346ea68b390a9c5c2e diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.5 b/metadata/md5-cache/net-dns/bind-tools-9.14.5 index 97fc40a34d20..9e56b8c2dcd7 100644 --- a/metadata/md5-cache/net-dns/bind-tools-9.14.5 +++ b/metadata/md5-cache/net-dns/bind-tools-9.14.5 @@ -11,5 +11,9 @@ RDEPEND=!<net-dns/bind-9.10.2 RESTRICT=test SLOT=0 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5d863aafb00dcc12046c3d9c2c1fcc5d diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.6 b/metadata/md5-cache/net-dns/bind-tools-9.14.6 index 689f1f2e1360..efa9174cc29c 100644 --- a/metadata/md5-cache/net-dns/bind-tools-9.14.6 +++ b/metadata/md5-cache/net-dns/bind-tools-9.14.6 @@ -11,5 +11,9 @@ RDEPEND=!<net-dns/bind-9.10.2 RESTRICT=test SLOT=0 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.6/bind-9.14.6.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5d863aafb00dcc12046c3d9c2c1fcc5d diff --git a/metadata/md5-cache/net-dns/bind-tools-9.15.2 b/metadata/md5-cache/net-dns/bind-tools-9.15.2 new file mode 100644 index 000000000000..1ef62161bbe9 --- /dev/null +++ b/metadata/md5-cache/net-dns/bind-tools-9.15.2 @@ -0,0 +1,14 @@ +BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=compile configure install prepare +DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) +DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen +EAPI=7 +HOMEPAGE=https://www.isc.org/software/bind +IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml +LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0 +RDEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2 +RESTRICT=test +SLOT=0 +SRC_URI=https://downloads.isc.org/isc/bind9/9.15.2/bind-9.15.2.tar.gz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=3d1b0072c369158b4a59a9106185e6f0 diff --git a/metadata/md5-cache/net-dns/bind-tools-9.15.3 b/metadata/md5-cache/net-dns/bind-tools-9.15.3 new file mode 100644 index 000000000000..2ced2aa367a8 --- /dev/null +++ b/metadata/md5-cache/net-dns/bind-tools-9.15.3 @@ -0,0 +1,14 @@ +BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=compile configure install prepare +DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) +DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen +EAPI=7 +HOMEPAGE=https://www.isc.org/software/bind +IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml +LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0 +RDEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2 +RESTRICT=test +SLOT=0 +SRC_URI=https://downloads.isc.org/isc/bind9/9.15.3/bind-9.15.3.tar.gz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=3d1b0072c369158b4a59a9106185e6f0 diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80 b/metadata/md5-cache/net-dns/dnsmasq-2.80 index b86eea2c8a98..75de98381446 100644 --- a/metadata/md5-cache/net-dns/dnsmasq-2.80 +++ b/metadata/md5-cache/net-dns/dnsmasq-2.80 @@ -11,5 +11,9 @@ RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn ) SLOT=0 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=3b9bb437795b373cda42fe6fda4b4a4b diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 index e9f1d270afa2..ceb45ab4aedc 100644 --- a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 +++ b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 @@ -5,11 +5,20 @@ DESCRIPTION=Small forwarding DNS server EAPI=7 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +inotify ipv6 lua nls script selinux static tftp +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +======= KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd +>>>>>>> next LICENSE=|| ( GPL-2 GPL-3 ) RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq ) REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn ) SLOT=0 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +_md5_=0149050596013c63e8f529809bc7ceb7 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 _md5_=2fa8206e50d8c38f14c2361017cd2b7a +>>>>>>> next diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz Binary files differindex 7e34535f4819..111336d66ebe 100644 --- a/metadata/md5-cache/net-fs/Manifest.gz +++ b/metadata/md5-cache/net-fs/Manifest.gz diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 index 29e582259016..b06aed33aa7d 100644 --- a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 +++ b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 @@ -12,5 +12,9 @@ RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils:= ads? ( sys REQUIRED_USE=acl? ( ads ) SLOT=0 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=26d64d58ceefb84c47bb09ee38a00184 diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1 index 31fe296300f4..d81df138c8f5 100644 --- a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1 +++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=kerberos? ( nfsv4 ) RESTRICT=test SLOT=0 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=7c59fc308a66f3d823e966015682ee81 diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 index a1857d441eb2..817ddd9f206c 100644 --- a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 +++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r2 @@ -12,5 +12,9 @@ REQUIRED_USE=kerberos? ( nfsv4 ) RESTRICT=test SLOT=0 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5f189f811c97261454748401963ed82b diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz Binary files differindex 6b145ad583f0..8861a676de2d 100644 --- a/metadata/md5-cache/net-ftp/Manifest.gz +++ b/metadata/md5-cache/net-ftp/Manifest.gz diff --git a/metadata/md5-cache/net-ftp/filezilla-3.45.0 b/metadata/md5-cache/net-ftp/filezilla-3.45.0 index 7db9eeab8c97..0e421eb9d3bc 100644 --- a/metadata/md5-cache/net-ftp/filezilla-3.45.0 +++ b/metadata/md5-cache/net-ftp/filezilla-3.45.0 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.18.2 <dev-libs/libfilezilla-0.19.0 >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) SLOT=0 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.45.0_src.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fe184dffde3ec34edfc195a9316383b6 diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz Binary files differindex b0ae880d901d..7997cf50336d 100644 --- a/metadata/md5-cache/net-im/Manifest.gz +++ b/metadata/md5-cache/net-im/Manifest.gz diff --git a/metadata/md5-cache/net-im/choqok-1.6.0_p20190726 b/metadata/md5-cache/net-im/choqok-1.6.0_p20190726 index 26cb1f8d3ba9..9d211cccab98 100644 --- a/metadata/md5-cache/net-im/choqok-1.6.0_p20190726 +++ b/metadata/md5-cache/net-im/choqok-1.6.0_p20190726 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca[qt5(+)] attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/choqok-1.6.0_p20190726.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=66c1865394b6c82e8e0ad85bd1a718d1 diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.12-r1 b/metadata/md5-cache/net-im/spectrum2-2.0.12-r1 index c95e8c0ee114..a83e7d2e56aa 100644 --- a/metadata/md5-cache/net-im/spectrum2-2.0.12-r1 +++ b/metadata/md5-cache/net-im/spectrum2-2.0.12-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) RESTRICT=test SLOT=0 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.12.tar.gz -> spectrum2-2.0.12.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4f23179068702aaa93c0501012d21578 diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz Binary files differindex a7f2508a85ae..224657bd3013 100644 --- a/metadata/md5-cache/net-irc/Manifest.gz +++ b/metadata/md5-cache/net-irc/Manifest.gz diff --git a/metadata/md5-cache/net-irc/anope-2.0.6 b/metadata/md5-cache/net-irc/anope-2.0.6 index 0434058479b3..12207c9a823c 100644 --- a/metadata/md5-cache/net-irc/anope-2.0.6 +++ b/metadata/md5-cache/net-irc/anope-2.0.6 @@ -11,5 +11,9 @@ RDEPEND=sys-devel/gettext mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs REQUIRED_USE=chanstats? ( mysql ) cs-fantasy-stats? ( chanstats mysql ) cs-fantasy-top? ( chanstats mysql ) irc2sql? ( mysql ) ldap-auth? ( ldap ) ldap-oper? ( ldap ) sql-auth? ( || ( mysql sqlite ) ) sql-log? ( mysql ) sql-oper? ( mysql ) SLOT=0 SRC_URI=https://github.com/anope/anope/releases/download/2.0.6/anope-2.0.6-source.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=cb539622f1c60b58609ed915c923fac7 diff --git a/metadata/md5-cache/net-irc/konversation-1.7.5-r1 b/metadata/md5-cache/net-irc/konversation-1.7.5-r1 index d6f9f62aceaa..408654dd831f 100644 --- a/metadata/md5-cache/net-irc/konversation-1.7.5-r1 +++ b/metadata/md5-cache/net-irc/konversation-1.7.5-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] crypt? ( app-crypt/qca:2[qt5(+)] ) crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/konversation/1.7.5/src/konversation-1.7.5.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8c26bdd7379921e9364ede10fe6c35dc diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz Binary files differindex 889f91caf88e..8f47ea74d1b2 100644 --- a/metadata/md5-cache/net-libs/Manifest.gz +++ b/metadata/md5-cache/net-libs/Manifest.gz diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 index e36d74417c9c..c35c35f836e4 100644 --- a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 +++ b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 @@ -10,5 +10,9 @@ RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) RESTRICT=!berkdb? ( test ) SLOT=0 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.69.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=4d229876d8f69232d7d4ffbdac7287d5 diff --git a/metadata/md5-cache/net-libs/kdav2-0.2.0 b/metadata/md5-cache/net-libs/kdav2-0.2.0 index d08c78dfa439..50fed5357e6c 100644 --- a/metadata/md5-cache/net-libs/kdav2-0.2.0 +++ b/metadata/md5-cache/net-libs/kdav2-0.2.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/kdav2/0.2.0/src/kdav2-0.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=fdc11a0de8eec3a1a6f2e33d20f39432 diff --git a/metadata/md5-cache/net-libs/kdav2-0.3.0 b/metadata/md5-cache/net-libs/kdav2-0.3.0 index 77433c26889f..59f1d82d4068 100644 --- a/metadata/md5-cache/net-libs/kdav2-0.3.0 +++ b/metadata/md5-cache/net-libs/kdav2-0.3.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/unstable/kdav2/0.3.0/src/kdav2-0.3.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5f300bd845b35a1879e632172a31daaa diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 index 02a293a53429..b757e1d9caa0 100644 --- a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 +++ b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/unstable/kimap2/0.2.0/src/kimap2-0.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=19d427382634aead2fe97af79cded4ff diff --git a/metadata/md5-cache/net-libs/kimap2-0.3.0 b/metadata/md5-cache/net-libs/kimap2-0.3.0 index c1797c4a6827..5b2f36b4d12c 100644 --- a/metadata/md5-cache/net-libs/kimap2-0.3.0 +++ b/metadata/md5-cache/net-libs/kimap2-0.3.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 RESTRICT=test SLOT=5 SRC_URI=mirror://kde/unstable/kimap2/0.3.0/src/kimap2-0.3.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=19d427382634aead2fe97af79cded4ff diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1-r2 b/metadata/md5-cache/net-libs/libktorrent-2.1-r2 index a0b673b1168b..88b055f2ebcf 100644 --- a/metadata/md5-cache/net-libs/libktorrent-2.1-r2 +++ b/metadata/md5-cache/net-libs/libktorrent-2.1-r2 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/ktorrent/5.1/libktorrent-2.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=195e32af98442da311544eb9414bb8b4 diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1.1 b/metadata/md5-cache/net-libs/libktorrent-2.1.1 index 110c52b95548..eab1128647c2 100644 --- a/metadata/md5-cache/net-libs/libktorrent-2.1.1 +++ b/metadata/md5-cache/net-libs/libktorrent-2.1.1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/ktorrent/5.1.2/libktorrent-2.1.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=231d3cfff5fb2bde1571b7a69dce3b9b diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1 index d0d28035894f..e6b92c73307c 100644 --- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1 +++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0: RESTRICT=test SLOT=5 SRC_URI=mirror://kde/stable/libkvkontakte/5.0.0/src/libkvkontakte-5.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7a5ab1fb7c4af864329e4a8003569512 diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1 index f20cf730f63c..5df7ca7cb207 100644 --- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1 +++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=edaa3c0f75889f22d74b482e455df23c diff --git a/metadata/md5-cache/net-libs/nghttp3-0_pre20190912 b/metadata/md5-cache/net-libs/nghttp3-0_pre20190912 index 83113225b198..80895d56f129 100644 --- a/metadata/md5-cache/net-libs/nghttp3-0_pre20190912 +++ b/metadata/md5-cache/net-libs/nghttp3-0_pre20190912 @@ -10,5 +10,9 @@ LICENSE=MIT RESTRICT=!test? ( test ) SLOT=0/0 SRC_URI=https://github.com/ngtcp2/nghttp3/archive/51379a041174ad953dc6ad437712f3b279f81919.tar.gz -> nghttp3-0_pre20190912.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a4ee5370b2d1d043637782d8514b7574 diff --git a/metadata/md5-cache/net-libs/nghttp3-9999 b/metadata/md5-cache/net-libs/nghttp3-9999 index 6f9ae7c15267..ee54824fb9d0 100644 --- a/metadata/md5-cache/net-libs/nghttp3-9999 +++ b/metadata/md5-cache/net-libs/nghttp3-9999 @@ -9,5 +9,9 @@ LICENSE=MIT PROPERTIES=live RESTRICT=!test? ( test ) SLOT=0/0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4c8dc77b1b49bceabbc9a3f773f8ba59 diff --git a/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912 b/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912 index dbae59409911..4a8bf2423a34 100644 --- a/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912 +++ b/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912 @@ -10,5 +10,9 @@ LICENSE=MIT RESTRICT=!test? ( test ) SLOT=0/0 SRC_URI=https://github.com/ngtcp2/ngtcp2/archive/5122d9e5e1e91c718ebc3933252ee42522c6e942.tar.gz -> ngtcp2-0_pre20190912.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e1bc9ec62e75299ac28cd78fc5661317 diff --git a/metadata/md5-cache/net-libs/ngtcp2-9999 b/metadata/md5-cache/net-libs/ngtcp2-9999 index 38c0e6b806bf..def2b9a7eef1 100644 --- a/metadata/md5-cache/net-libs/ngtcp2-9999 +++ b/metadata/md5-cache/net-libs/ngtcp2-9999 @@ -9,5 +9,9 @@ LICENSE=MIT PROPERTIES=live RESTRICT=!test? ( test ) SLOT=0/0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8de427d0c168ef7d27eafbe9cd3ffa9a diff --git a/metadata/md5-cache/net-libs/nodejs-8.12.0 b/metadata/md5-cache/net-libs/nodejs-8.12.0 index ba8b111df82d..cbb811dd3cfb 100644 --- a/metadata/md5-cache/net-libs/nodejs-8.12.0 +++ b/metadata/md5-cache/net-libs/nodejs-8.12.0 @@ -11,5 +11,9 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) RESTRICT=test SLOT=0 SRC_URI=https://nodejs.org/dist/v8.12.0/node-v8.12.0.tar.xz +<<<<<<< HEAD +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=4d9f8c707cea5e1b1f84e27aefbeebb3 diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 index dee938d77648..8d5f0ad36851 100644 --- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 +++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.08/src/telepathy-logger-qt-17.08.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b6c3a7de0dbe5193b1dca77b4a5d5445 diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz Binary files differindex e766678470f7..5282b5004147 100644 --- a/metadata/md5-cache/net-mail/Manifest.gz +++ b/metadata/md5-cache/net-mail/Manifest.gz diff --git a/metadata/md5-cache/net-mail/checkpassword-0.90-r3 b/metadata/md5-cache/net-mail/checkpassword-0.90-r3 index 278e57902025..f8bf850762f0 100644 --- a/metadata/md5-cache/net-mail/checkpassword-0.90-r3 +++ b/metadata/md5-cache/net-mail/checkpassword-0.90-r3 @@ -9,5 +9,9 @@ LICENSE=all-rights-reserved RESTRICT=mirror bindist SLOT=0 SRC_URI=http://cr.yp.to/checkpwd/checkpassword-0.90.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=75110290a143f36f1ff2afa7f9dd0931 diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 index 4aa984e255c0..482aa744b134 100644 --- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 +++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r3 @@ -10,5 +10,9 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql ) v REQUIRED_USE=?? ( mysql postgres ) SLOT=0 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=cad3612a19b8b193c5372eb773c33216 diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.1 b/metadata/md5-cache/net-mail/notmuch-0.29.1 index a13aab68fe24..5fc1562f8dbb 100644 --- a/metadata/md5-cache/net-mail/notmuch-0.29.1 +++ b/metadata/md5-cache/net-mail/notmuch-0.29.1 @@ -10,5 +10,9 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind ) SLOT=0/5 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz ) +<<<<<<< HEAD +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=11f60673e1ea080b1f5d44322c9f3a30 diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.1-r1 b/metadata/md5-cache/net-mail/notmuch-0.29.1-r1 index c138845a5ba1..5062443131df 100644 --- a/metadata/md5-cache/net-mail/notmuch-0.29.1-r1 +++ b/metadata/md5-cache/net-mail/notmuch-0.29.1-r1 @@ -10,5 +10,9 @@ RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmim REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind ) SLOT=0/5 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz ) +<<<<<<< HEAD +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1da850985a849e40e328366997c4022e diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 index fec8b2e8efbd..7bd469e2183a 100644 --- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 +++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r1 @@ -10,5 +10,9 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? RESTRICT=userpriv SLOT=0 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 +>>>>>>> next _md5_=81763d323f0c111df8eb5464811259c0 diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16 index d9275bb53ed8..56aa4a56abb5 100644 --- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16 +++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16 @@ -10,5 +10,9 @@ RDEPEND=virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/autorespond maildrop? RESTRICT=userpriv SLOT=0 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 +>>>>>>> next _md5_=218b74da7689af053b70d6af57784a5e diff --git a/metadata/md5-cache/net-mail/vchkuser-0.4 b/metadata/md5-cache/net-mail/vchkuser-0.4 index ad8a71ac1347..c264dac53e37 100644 --- a/metadata/md5-cache/net-mail/vchkuser-0.4 +++ b/metadata/md5-cache/net-mail/vchkuser-0.4 @@ -8,5 +8,9 @@ KEYWORDS=amd64 x86 LICENSE=BSD SLOT=0 SRC_URI=https://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=755014e3a95090323c2d540ce2e773d2 diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33 index cf190faaac0f..374f6cc1e8af 100644 --- a/metadata/md5-cache/net-mail/vpopmail-5.4.33 +++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33 @@ -9,5 +9,10 @@ LICENSE=GPL-2 RDEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) SLOT=0 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=ea8118dba1c9975ce89af3d23ca3abae +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=b6004263e129d342e95b6f22594c8c64 +>>>>>>> next diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3 index 042dcaa899ba..893593d570e2 100644 --- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3 +++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r3 @@ -10,5 +10,10 @@ RDEPEND=acct-group/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mys REQUIRED_USE=mysql? ( !postgres ) SLOT=0 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=07672be193e116630d1440ea617f9cba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=f92ec6f4e7ff1842a50f66d1c847dc14 +>>>>>>> next diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7 b/metadata/md5-cache/net-mail/vqadmin-2.3.7 index d3f8df87f918..486328410042 100644 --- a/metadata/md5-cache/net-mail/vqadmin-2.3.7 +++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin >=app-admin/webapp-config-1.50.15 SLOT=0 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 +>>>>>>> next _md5_=76f0e82f676f68a5e9e149589573dde6 diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz Binary files differindex 0ee9126438b9..2401e2617fc8 100644 --- a/metadata/md5-cache/net-misc/Manifest.gz +++ b/metadata/md5-cache/net-misc/Manifest.gz diff --git a/metadata/md5-cache/net-misc/dropbear-2017.75 b/metadata/md5-cache/net-misc/dropbear-2017.75 index 06e595f00b47..c7114232a85c 100644 --- a/metadata/md5-cache/net-misc/dropbear-2017.75 +++ b/metadata/md5-cache/net-misc/dropbear-2017.75 @@ -10,5 +10,9 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/ REQUIRED_USE=pam? ( !static ) SLOT=0 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=0e8fa0eddda7b10ae75c8a1742e038bb diff --git a/metadata/md5-cache/net-misc/dropbear-2018.76 b/metadata/md5-cache/net-misc/dropbear-2018.76 index 95079bc38910..2cd9743fcc30 100644 --- a/metadata/md5-cache/net-misc/dropbear-2018.76 +++ b/metadata/md5-cache/net-misc/dropbear-2018.76 @@ -10,5 +10,9 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/ REQUIRED_USE=pam? ( !static ) SLOT=0 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=66063e79eee02498bb5589030aa38bcc diff --git a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 index 3c79cf6bed75..acd37fc5b92c 100644 --- a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 +++ b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libksysguard-5.15.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) !net-misc/knemo:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dev.gentoo.org/~johu/distfiles/knemo-0.8.0_pre20161211.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=469862f8e96c90e24c48c2ff66cd0ae1 diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 index 6417fc694b46..31c54fb71d2b 100644 --- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 +++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.17 @@ -9,5 +9,9 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 ) REQUIRED_USE=kernel_linux SLOT=0 SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.17.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=4d3404bf4fb9b0ac0bdb6c2af1a59202 diff --git a/metadata/md5-cache/net-misc/memcached-1.5.18 b/metadata/md5-cache/net-misc/memcached-1.5.18 index 638938637b28..4b1d033636c3 100644 --- a/metadata/md5-cache/net-misc/memcached-1.5.18 +++ b/metadata/md5-cache/net-misc/memcached-1.5.18 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) SLOT=0 SRC_URI=https://www.memcached.org/files/memcached-1.5.18.tar.gz https://www.memcached.org/files/old/memcached-1.5.18.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f42ee145d1136616a54b6d94c7a39bfc diff --git a/metadata/md5-cache/net-misc/openssh-8.0_p1-r2 b/metadata/md5-cache/net-misc/openssh-8.0_p1-r2 index ca3335ec69c3..dd3c3d9c6c14 100644 --- a/metadata/md5-cache/net-misc/openssh-8.0_p1-r2 +++ b/metadata/md5-cache/net-misc/openssh-8.0_p1-r2 @@ -11,5 +11,9 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( ! RESTRICT=!test? ( test ) SLOT=0 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.0p1.tar.gz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-8.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8p1/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8p1/openssh-7_8_P1-hpn-AES-CTR-14.16.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.1/openssh-8.0p1+x509-12.1.diff.gz ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=ebaa011256d4663194e30755d0def672 diff --git a/metadata/md5-cache/net-misc/remmina-1.3.6-r1 b/metadata/md5-cache/net-misc/remmina-1.3.6-r1 index 104307d12f85..ee9604208cb6 100644 --- a/metadata/md5-cache/net-misc/remmina-1.3.6-r1 +++ b/metadata/md5-cache/net-misc/remmina-1.3.6-r1 @@ -9,5 +9,5 @@ LICENSE=GPL-2+-with-openssl-exception RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4 ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( net-dns/avahi[dbus,gtk3] ) virtual/freedesktop-icon-theme SLOT=0 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.3.6/Remmina-v1.3.6.tar.gz -_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=3961fcd96a605ab1f35eba67faabc3df diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.2 b/metadata/md5-cache/net-misc/smb4k-3.0.2 index 58667186d80c..e675c2f1e5e5 100644 --- a/metadata/md5-cache/net-misc/smb4k-3.0.2 +++ b/metadata/md5-cache/net-misc/smb4k-3.0.2 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-fs/samba[cups] plasma? ( >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://sourceforge/smb4k/smb4k-3.0.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8dca587effffafb71a2e3d74c68edbe8 diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz Binary files differindex 481bd42ae85b..8500860d923d 100644 --- a/metadata/md5-cache/net-nds/Manifest.gz +++ b/metadata/md5-cache/net-nds/Manifest.gz diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz Binary files differindex 9d39be39d978..bb1076c544ae 100644 --- a/metadata/md5-cache/net-news/Manifest.gz +++ b/metadata/md5-cache/net-news/Manifest.gz diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz Binary files differindex 580d3e763d4e..503939161e0e 100644 --- a/metadata/md5-cache/net-nntp/Manifest.gz +++ b/metadata/md5-cache/net-nntp/Manifest.gz diff --git a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623 b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623 index 2b9ce98b6bac..46bd9179ec29 100644 --- a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623 +++ b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !net-nntp/kwooty:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwooty-1.1.0_p20150623.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8214b95bab24a8c938306d2b4c338f06 diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz Binary files differindex ae7253314076..5cf2271420d5 100644 --- a/metadata/md5-cache/net-p2p/Manifest.gz +++ b/metadata/md5-cache/net-p2p/Manifest.gz diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.1-r1 b/metadata/md5-cache/net-p2p/ktorrent-5.1.1-r1 index 82ef70ccf0d4..bf5113d9cb87 100644 --- a/metadata/md5-cache/net-p2p/ktorrent-5.1.1-r1 +++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.1-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/libktorrent-2.1:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.15.5:5 ) stats? ( >=kde-frameworks/kplotting-5.60.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.60.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.60.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/ktorrent/5.1.1/ktorrent-5.1.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d0eda87feab89f5406494b6a9d9dfeaf diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1 b/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1 index e3a1a0c45f4a..cb68ccccf4ad 100644 --- a/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1 +++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/libktorrent-2.1.1:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.15.5:5 ) stats? ( >=kde-frameworks/kplotting-5.60.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.60.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.60.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/ktorrent/5.1.2/ktorrent-5.1.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a0f3b1557272ab1a4791cea7bf3359d2 diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz Binary files differindex 4cbbc8a7b534..1176aca487dd 100644 --- a/metadata/md5-cache/net-proxy/Manifest.gz +++ b/metadata/md5-cache/net-proxy/Manifest.gz diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz Binary files differindex 657287378ce8..90f6d897eb7f 100644 --- a/metadata/md5-cache/net-vpn/Manifest.gz +++ b/metadata/md5-cache/net-vpn/Manifest.gz diff --git a/metadata/md5-cache/net-vpn/tor-0.4.1.6 b/metadata/md5-cache/net-vpn/tor-0.4.1.6 index 6a62737ac97b..f5e0ad40ff61 100644 --- a/metadata/md5-cache/net-vpn/tor-0.4.1.6 +++ b/metadata/md5-cache/net-vpn/tor-0.4.1.6 @@ -10,5 +10,9 @@ LICENSE=BSD GPL-2 RDEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor ) SLOT=0 SRC_URI=https://www.torproject.org/dist/tor-0.4.1.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.1.6.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=0a9c88b2d28266ec876de36b3afc637a diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz Binary files differindex c3b5c792782f..4fa71a5f00c8 100644 --- a/metadata/md5-cache/net-wireless/Manifest.gz +++ b/metadata/md5-cache/net-wireless/Manifest.gz diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1 b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1 index d54f07d89a83..0d58dd5ea679 100644 --- a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1 +++ b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=~net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0= SLOT=0 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=89a5ca4e528ca1c0e3776b79440396a8 diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-9999 b/metadata/md5-cache/net-wireless/hackrf-tools-9999 index 6f355caeb44f..f1eea995e755 100644 --- a/metadata/md5-cache/net-wireless/hackrf-tools-9999 +++ b/metadata/md5-cache/net-wireless/hackrf-tools-9999 @@ -8,5 +8,9 @@ LICENSE=BSD PROPERTIES=live RDEPEND=~net-libs/libhackrf-9999:= sci-libs/fftw:3.0= SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c04c71800c1b1ee83c80d9c25f2f3a27 diff --git a/metadata/md5-cache/net-wireless/iwd-0.21 b/metadata/md5-cache/net-wireless/iwd-0.21 index eedde13c4ae3..14daae436072 100644 --- a/metadata/md5-cache/net-wireless/iwd-0.21 +++ b/metadata/md5-cache/net-wireless/iwd-0.21 @@ -9,5 +9,5 @@ LICENSE=GPL-2 RDEPEND=>=dev-libs/ell-0.23 net-wireless/wireless-regdb sys-apps/dbus client? ( sys-libs/readline:0= ) crda? ( net-wireless/crda ) SLOT=0 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.21.tar.xz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=18b5fa26322e37df22ced0b7a5fca5cc diff --git a/metadata/md5-cache/net-wireless/iwd-9999 b/metadata/md5-cache/net-wireless/iwd-9999 index 143a95441e73..dcec3014c4cd 100644 --- a/metadata/md5-cache/net-wireless/iwd-9999 +++ b/metadata/md5-cache/net-wireless/iwd-9999 @@ -8,5 +8,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=>=dev-libs/ell-0.21 sys-apps/dbus client? ( sys-libs/readline:0= ) net-wireless/wireless-regdb crda? ( net-wireless/crda ) SLOT=0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=bdc1cea7f53e4f3dc8f264150f0e97b2 diff --git a/metadata/md5-cache/net-wireless/wavemon-0.7.6 b/metadata/md5-cache/net-wireless/wavemon-0.7.6 index 28026d897526..021f1d7184ad 100644 --- a/metadata/md5-cache/net-wireless/wavemon-0.7.6 +++ b/metadata/md5-cache/net-wireless/wavemon-0.7.6 @@ -9,5 +9,9 @@ LICENSE=GPL-3 RDEPEND=sys-libs/ncurses caps? ( sys-libs/libcap ) SLOT=0 SRC_URI=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=64418b510e51c9e29990659c413ddcf4 diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz Binary files differindex b9f490e07053..c3a951f204e9 100644 --- a/metadata/md5-cache/sci-astronomy/Manifest.gz +++ b/metadata/md5-cache/sci-astronomy/Manifest.gz diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.2.3 b/metadata/md5-cache/sci-astronomy/kstars-3.2.3 index b673f8e27128..200300da92a1 100644 --- a/metadata/md5-cache/sci-astronomy/kstars-3.2.3 +++ b/metadata/md5-cache/sci-astronomy/kstars-3.2.3 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde- REQUIRED_USE=indi? ( fits ) python_targets_python2_7 SLOT=5 SRC_URI=mirror://kde/stable/kstars/kstars-3.2.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=5f686cb14c91bdf489d7e9b8a7d1a0a7 diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz Binary files differindex 382a923695ba..6b8af7be8178 100644 --- a/metadata/md5-cache/sci-biology/Manifest.gz +++ b/metadata/md5-cache/sci-biology/Manifest.gz diff --git a/metadata/md5-cache/sci-biology/bfast-0.7.0a b/metadata/md5-cache/sci-biology/bfast-0.7.0a index ba4554e9470e..c9392511b2cb 100644 --- a/metadata/md5-cache/sci-biology/bfast-0.7.0a +++ b/metadata/md5-cache/sci-biology/bfast-0.7.0a @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-perl/XML-Simple SLOT=0 SRC_URI=mirror://sourceforge/bfast/bfast-0.7.0a.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=abc362f15c5107d96bedfb879ea0375f diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz Binary files differindex a69fb434bf98..f3c2e68e1607 100644 --- a/metadata/md5-cache/sci-calculators/Manifest.gz +++ b/metadata/md5-cache/sci-calculators/Manifest.gz diff --git a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 index c2bcdd5e8ba4..ec7119f9e8f1 100644 --- a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 +++ b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 @@ -8,5 +8,9 @@ LICENSE=GPL-2 RDEPEND=x11-libs/libX11 x11-libs/libXpm SLOT=0 SRC_URI=https://github.com/downloads/jlec/hcalc/hcalc-1.2.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7f332d127f59747df3edff15e2cbf517 diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 index 547114958160..80af83b768f9 100644 --- a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 +++ b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ FDL-1.2 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !sci-calculators/keurocalc:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/keurocalc/keurocalc-1.3.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=feccba165e21c50ebd3427274505ec04 diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz Binary files differindex eb793a6cb748..7c24afc29b7a 100644 --- a/metadata/md5-cache/sci-chemistry/Manifest.gz +++ b/metadata/md5-cache/sci-chemistry/Manifest.gz diff --git a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1 b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1 index 7c63688070b8..eea1138e72bc 100644 --- a/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1 +++ b/metadata/md5-cache/sci-chemistry/gelemental-1.2.0-r1 @@ -9,5 +9,9 @@ LICENSE=GPL-3 MIT RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2 SLOT=0 SRC_URI=http://www.kdau.com/files/gelemental-1.2.0.tar.bz2 mirror://debian/pool/main/g/gelemental/gelemental_1.2.0-8.debian.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=af539120e80fdc2b368ea013a0d0d8c9 diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz Binary files differindex 038547a03aeb..2a7d4f9ab55b 100644 --- a/metadata/md5-cache/sci-electronics/Manifest.gz +++ b/metadata/md5-cache/sci-electronics/Manifest.gz diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz Binary files differindex aed04e749a58..64d050923fdb 100644 --- a/metadata/md5-cache/sci-geosciences/Manifest.gz +++ b/metadata/md5-cache/sci-geosciences/Manifest.gz diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.5 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.5 index b4a5af02696a..8d97a88a992e 100644 --- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.5 +++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.5 @@ -10,5 +10,9 @@ RDEPEND=dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zl REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) ) SLOT=0 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.0.5.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=efd4f4cce248546898bccc74285a9a0d diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 index 81f1f60432d2..f93b0001d100 100644 --- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 +++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 @@ -10,5 +10,9 @@ RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) ) SLOT=0 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.0.7.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=14333728236270683a636ab99579ec5d diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.2.2 b/metadata/md5-cache/sci-geosciences/mapserver-7.2.2 index 70a822d867af..ce5a69bebc2d 100644 --- a/metadata/md5-cache/sci-geosciences/mapserver-7.2.2 +++ b/metadata/md5-cache/sci-geosciences/mapserver-7.2.2 @@ -10,5 +10,9 @@ RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) ) SLOT=0 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.2.2.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 cmake-utils 91d6ef31dc426240577497cacbf2508c depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 16783e418aca3ffa461d68310bf7ab12 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dc70b40263894231ff609655b2384b55 diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz Binary files differindex 5892dfddf4c2..4f08a2574420 100644 --- a/metadata/md5-cache/sci-libs/Manifest.gz +++ b/metadata/md5-cache/sci-libs/Manifest.gz diff --git a/metadata/md5-cache/sci-libs/arpack-3.1.5 b/metadata/md5-cache/sci-libs/arpack-3.1.5 index 0829a73b2f5a..f1fdab5bd8a4 100644 --- a/metadata/md5-cache/sci-libs/arpack-3.1.5 +++ b/metadata/md5-cache/sci-libs/arpack-3.1.5 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran SLOT=0 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack-ng_3.1.5.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=0d7f7ddc5ed4f7cb6388b92ac5c6b7d8 diff --git a/metadata/md5-cache/sci-libs/cln-1.3.3 b/metadata/md5-cache/sci-libs/cln-1.3.3 index f4473709f8cb..11b986355ac5 100644 --- a/metadata/md5-cache/sci-libs/cln-1.3.3 +++ b/metadata/md5-cache/sci-libs/cln-1.3.3 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/gmp:0= SLOT=1 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=dfabe48e503c1cbb04d612a425520b8b diff --git a/metadata/md5-cache/sci-libs/cln-1.3.4 b/metadata/md5-cache/sci-libs/cln-1.3.4 index 2d2662abd911..5617fe76574f 100644 --- a/metadata/md5-cache/sci-libs/cln-1.3.4 +++ b/metadata/md5-cache/sci-libs/cln-1.3.4 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/gmp:0= SLOT=1 SRC_URI=https://www.ginac.de/CLN/cln-1.3.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=29453d0c24512646887a8b55df299f0c diff --git a/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9 b/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9 index 9db341d94ccc..ae703984cacb 100644 --- a/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9 +++ b/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9 @@ -9,5 +9,9 @@ LICENSE=EPL-1.0 RDEPEND=sci-libs/coinor-clp:= sci-libs/coinor-cgl:= sci-libs/coinor-dylp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/coinor-vol:= SLOT=0/3 SRC_URI=http://www.coin-or.org/download/source/Cbc/Cbc-2.8.9.tgz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=49443a79de253507cc7c71a007f1a874 diff --git a/metadata/md5-cache/sci-libs/grib_api-1.11.0 b/metadata/md5-cache/sci-libs/grib_api-1.11.0 new file mode 100644 index 000000000000..aa2a138ceb8a --- /dev/null +++ b/metadata/md5-cache/sci-libs/grib_api-1.11.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=jpeg2k? ( media-libs/openjpeg:0 !!media-libs/jasper ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 fortran? ( virtual/fortran ) +DESCRIPTION=Library for decoding WMO FM-92 GRIB messages +EAPI=5 +HOMEPAGE=https://software.ecmwf.int/wiki/display/GRIB/Home +IUSE=doc examples fortran jpeg2k netcdf openmp png python static-libs threads perl python_targets_python2_7 +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=Apache-2.0 +RDEPEND=jpeg2k? ( media-libs/openjpeg:0 !!media-libs/jasper ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) fortran? ( virtual/fortran ) +REQUIRED_USE=python? ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.11.0.tar.gz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=5d9df8762431eca27ad9a790ab4ba81d diff --git a/metadata/md5-cache/sci-libs/libxc-2.1.3 b/metadata/md5-cache/sci-libs/libxc-2.1.3 index db411ace41d7..05bda63a08c2 100644 --- a/metadata/md5-cache/sci-libs/libxc-2.1.3 +++ b/metadata/md5-cache/sci-libs/libxc-2.1.3 @@ -9,5 +9,9 @@ LICENSE=LGPL-3 RDEPEND=virtual/fortran SLOT=0 SRC_URI=http://www.tddft.org/programs/octopus/download/libxc/libxc-2.1.3.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=2fd3c43feb0647898e5932d07c9c03f7 diff --git a/metadata/md5-cache/sci-libs/libxc-2.2.3 b/metadata/md5-cache/sci-libs/libxc-2.2.3 index 7bb32266928d..baec7239cadd 100644 --- a/metadata/md5-cache/sci-libs/libxc-2.2.3 +++ b/metadata/md5-cache/sci-libs/libxc-2.2.3 @@ -9,5 +9,9 @@ LICENSE=LGPL-3 RDEPEND=virtual/fortran SLOT=0 SRC_URI=http://www.tddft.org/programs/octopus/download/libxc/libxc-2.2.3.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=a9995433b8a650bca1368de1ff7cb63e diff --git a/metadata/md5-cache/sci-libs/libxc-3.0.0 b/metadata/md5-cache/sci-libs/libxc-3.0.0 index 69a177df0dfc..26f69aebde35 100644 --- a/metadata/md5-cache/sci-libs/libxc-3.0.0 +++ b/metadata/md5-cache/sci-libs/libxc-3.0.0 @@ -9,5 +9,9 @@ LICENSE=LGPL-3 RDEPEND=virtual/fortran SLOT=0 SRC_URI=http://www.tddft.org/programs/octopus/download/libxc/libxc-3.0.0.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=2fd3c43feb0647898e5932d07c9c03f7 diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.13.1 b/metadata/md5-cache/sci-libs/tensorflow-1.13.1 index 5779de993d57..b23deafed5dd 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-1.13.1 +++ b/metadata/md5-cache/sci-libs/tensorflow-1.13.1 @@ -12,5 +12,9 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncp REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) SLOT=0 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.13.1.tar.gz -> tensorflow-1.13.1.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/9f48e814419e.tar.gz -> eigen-9f48e814419e.tar.gz https://github.com/abseil/abseil-cpp/archive/389ec3f906f018661a5308458d623d01f96d7b23.tar.gz -> abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/bazelbuild/rules_docker/archive/a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz -> rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz -> bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz ) +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=b8e38a81578f26407cea6938e3b2b3de diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1 b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1 index e259f27a203c..ca55a8ce26a4 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1 +++ b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1 @@ -12,5 +12,9 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncp REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) SLOT=0 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.14.0.tar.gz -> tensorflow-1.14.0.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz ) +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=afa33f812831c7f3acef0b7097913d82 diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2 index 87a914a8eeb0..eac3b289abf1 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2 +++ b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2 @@ -12,5 +12,9 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncp REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) SLOT=0 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.14.0.tar.gz -> tensorflow-1.14.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.14.0-r2.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz ) +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=6dd76d99ed8d82e6a0a5e675ace5a493 diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0 b/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0 index d2c302b1c36d..d861e3eecd8c 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0 +++ b/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0 @@ -12,5 +12,9 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncp REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) SLOT=0 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.15.0-rc0.tar.gz -> tensorflow-1.15.0_rc0.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://bitbucket.org/eigen/eigen/get/8071cda5714d.tar.gz -> eigen-8071cda5714d.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz https://github.com/llvm-mirror/llvm/archive/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz -> llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz ) +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 check-reqs 5e40a693d9c828e8f3655184116e8b73 cuda bb861e5221b7272ac90c2f12791c1e66 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=90b2aa7e33cf55255c84f74a60b79a53 diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.13.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.13.0 index ee9273fad410..903848c47fd8 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.13.0 +++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.13.0 @@ -11,5 +11,9 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_p REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0 SRC_URI=https://github.com/tensorflow/estimator/archive/v1.13.0.tar.gz -> tensorflow-estimator-1.13.0.tar.gz +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=0b9459a48734b5f7359009dc2a84f623 diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.14.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.14.0 index 5ee6a2c4cde2..40d5b167be5c 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.14.0 +++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.14.0 @@ -11,5 +11,9 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_p REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0 SRC_URI=https://github.com/tensorflow/estimator/archive/v1.14.0.tar.gz -> tensorflow-estimator-1.14.0.tar.gz +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=7cd7f6bcfaf65ea5bf890c1062208a2b diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0 index a812577f3c60..664694a9c4e8 100644 --- a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0 +++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0 @@ -11,5 +11,9 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_p REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0 SRC_URI=https://github.com/tensorflow/estimator/archive/v1.15.0.tar.gz -> tensorflow-estimator-1.15.0.tar.gz +<<<<<<< HEAD +_eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bazel ebb3dcd2fe446add9b64ccdba216d1c1 distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=0cdd8849026f37b6217af87c7d805db4 diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz Binary files differindex f7ae6492a3c0..45ffa6d63321 100644 --- a/metadata/md5-cache/sci-mathematics/Manifest.gz +++ b/metadata/md5-cache/sci-mathematics/Manifest.gz diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.7.2 b/metadata/md5-cache/sci-mathematics/ginac-1.7.2 index 1c55b7ff9032..a92ad25a4910 100644 --- a/metadata/md5-cache/sci-mathematics/ginac-1.7.2 +++ b/metadata/md5-cache/sci-mathematics/ginac-1.7.2 @@ -9,5 +9,9 @@ LICENSE=GPL-2+ RDEPEND=>=sci-libs/cln-1.2.2 SLOT=0 SRC_URI=http://www.ginac.de/ginac-1.7.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=7ab3411a31c13fbc2ec09075a71b0136 diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1 index b6d91ed2a434..5dc4639df0cf 100644 --- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1 +++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1 @@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3 RDEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp] ) SLOT=0 SRC_URI=https://gforge.inria.fr/frs/download.php/36224/gmp-ecm-7.0.4.tar.gz -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=7e6826662236b7c9d3f9486fdffd1922 diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.0b b/metadata/md5-cache/sci-mathematics/rkward-0.7.0b index 0498ce515d7f..20e4cd42843e 100644 --- a/metadata/md5-cache/sci-mathematics/rkward-0.7.0b +++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.0b @@ -10,5 +10,9 @@ LICENSE=GPL-2+ LGPL-2 RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-lang/R virtual/libintl !sci-mathematics/rkward:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/rkward/0.7.0/src/rkward-0.7.0b.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8d95267fdc7c6e1e3bef31140fda18cc diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.5 b/metadata/md5-cache/sci-mathematics/z3-4.8.5 index 52e9fadb7bdb..79a248f15252 100644 --- a/metadata/md5-cache/sci-mathematics/z3-4.8.5 +++ b/metadata/md5-cache/sci-mathematics/z3-4.8.5 @@ -10,5 +10,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=0/4.8 SRC_URI=https://github.com/Z3Prover/z3/archive/Z3-4.8.5.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=827eefb70ced103ec1cc5046a3a864c7 diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.6 b/metadata/md5-cache/sci-mathematics/z3-4.8.6 index 6f4fa5a016a8..c2213c84dbad 100644 --- a/metadata/md5-cache/sci-mathematics/z3-4.8.6 +++ b/metadata/md5-cache/sci-mathematics/z3-4.8.6 @@ -11,5 +11,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) SLOT=0/4.8 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.6.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ca9b64d17fde129151fee1a1281394f1 diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz Binary files differindex c65a9810c944..1fbb6f97532d 100644 --- a/metadata/md5-cache/sci-misc/Manifest.gz +++ b/metadata/md5-cache/sci-misc/Manifest.gz diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz Binary files differindex 50eec830635f..d1b631de845f 100644 --- a/metadata/md5-cache/sci-physics/Manifest.gz +++ b/metadata/md5-cache/sci-physics/Manifest.gz diff --git a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 index 9d6bfebcba26..3124da2754b1 100644 --- a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 +++ b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 @@ -10,5 +10,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) SLOT=0 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=248407bfa0df02980968c1f6ef1f391f diff --git a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 index aafe8b58aa40..22b64d85676e 100644 --- a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 +++ b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 @@ -10,5 +10,9 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) SLOT=0 SRC_URI=https://github.com/espressomd/espresso/archive/8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz -> espresso-4.0_pre20170228.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=91ffc280a6406b45d3b1ad560d39ed19 diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999 index 5fcf3b9f1a13..0aa76b0f3d80 100644 --- a/metadata/md5-cache/sci-physics/espresso-9999 +++ b/metadata/md5-cache/sci-physics/espresso-9999 @@ -9,5 +9,9 @@ PROPERTIES=live RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/cython-0.26.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) dev-libs/boost:=[mpi] hdf5? ( sci-libs/hdf5:=[mpi] ) REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=495d7404af5a83cfb61f5b16b09e759e diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1 b/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1 index 1fa6175e9314..cc29bf220500 100644 --- a/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1 +++ b/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 QPL RDEPEND=cgal? ( sci-mathematics/cgal ) plugins? ( virtual/fortran ) SLOT=0 SRC_URI=http://www.fastjet.fr//repo/fastjet-3.0.3.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=4ccb34e101ebd31d60e99f1149ba74c6 diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1 b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1 index 31ddd440583f..be9b3f142326 100644 --- a/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1 +++ b/metadata/md5-cache/sci-physics/fastjet-3.0.6-r1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 QPL RDEPEND=cgal? ( sci-mathematics/cgal ) plugins? ( virtual/fortran ) SLOT=0 SRC_URI=http://www.fastjet.fr//repo/fastjet-3.0.6.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 fortran-2 f75a2d9321053acf424991e805f32ede libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=fcce9f1de5b291eabae6a546e7f1e220 diff --git a/metadata/md5-cache/sci-physics/herwig++-2.7.1-r1 b/metadata/md5-cache/sci-physics/herwig++-2.7.1-r1 index 6cd6c62ce5f8..cd369f953cec 100644 --- a/metadata/md5-cache/sci-physics/herwig++-2.7.1-r1 +++ b/metadata/md5-cache/sci-physics/herwig++-2.7.1-r1 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/boost:0= sci-libs/gsl:0= <=sci-physics/looptools-2.8:0= ~sci-physics/thepeg-1.9.2:0= fastjet? ( sci-physics/fastjet:0= ) SLOT=0/15 SRC_URI=http://www.hepforge.org/archive/herwig/Herwig++-2.7.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=4a79cd2983d82255fb4a8a32595ab880 diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.1.6 b/metadata/md5-cache/sci-physics/lhapdf-6.1.6 new file mode 100644 index 000000000000..356b988e797c --- /dev/null +++ b/metadata/md5-cache/sci-physics/lhapdf-6.1.6 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare test +DEPEND=dev-libs/boost:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( app-doc/doxygen[latex] ) >=app-portage/elt-patches-20170815 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] +DESCRIPTION=Les Houches Parton Density Function unified library +EAPI=5 +HOMEPAGE=http://lhapdf.hepforge.org/ +IUSE=doc examples python static-libs python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=dev-libs/boost:0= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] +REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) +SLOT=0 +SRC_URI=http://www.hepforge.org/archive/lhapdf/LHAPDF-6.1.6.tar.gz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 9838160d624a44b2d56d1266a69fd473 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=43b312d9471b1fbbb2cca4ade5856be2 diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz Binary files differindex 06a52b9cf412..8b08760a912a 100644 --- a/metadata/md5-cache/sci-visualization/Manifest.gz +++ b/metadata/md5-cache/sci-visualization/Manifest.gz diff --git a/metadata/md5-cache/sci-visualization/fityk-1.2.9 b/metadata/md5-cache/sci-visualization/fityk-1.2.9 index 1b9ed5ff5ad3..7c4a6fdb1ba7 100644 --- a/metadata/md5-cache/sci-visualization/fityk-1.2.9 +++ b/metadata/md5-cache/sci-visualization/fityk-1.2.9 @@ -10,5 +10,9 @@ RDEPEND=>=sci-libs/xylib-1 >=dev-lang/lua-5.1:0 nlopt? ( sci-libs/nlopt ) python REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) SLOT=0 SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.2.9/fityk-1.2.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 +>>>>>>> next _md5_=ec88435baa0ef85262441e96cafcec13 diff --git a/metadata/md5-cache/sci-visualization/labplot-2.6.0 b/metadata/md5-cache/sci-visualization/labplot-2.6.0 index 7f86929d01f0..3fc2069eb096 100644 --- a/metadata/md5-cache/sci-visualization/labplot-2.6.0 +++ b/metadata/md5-cache/sci-visualization/labplot-2.6.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtserialport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-apps/cantor-19.04.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/labplot/2.6.0/labplot-2.6.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=73c07cbb1fd710ea356aaae6dcfad51b diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999 index f4be3565aa24..a60df74bb01f 100644 --- a/metadata/md5-cache/sci-visualization/labplot-9999 +++ b/metadata/md5-cache/sci-visualization/labplot-9999 @@ -9,5 +9,9 @@ LICENSE=GPL-2 PROPERTIES=live RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtserialport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-apps/cantor-19.04.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0c4e8371a1bb6f32cbdd22a2bfdfd08b diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz Binary files differindex f941c24440ac..995bb19edd8d 100644 --- a/metadata/md5-cache/sys-apps/Manifest.gz +++ b/metadata/md5-cache/sys-apps/Manifest.gz diff --git a/metadata/md5-cache/sys-apps/busybox-1.29.0 b/metadata/md5-cache/sys-apps/busybox-1.29.0 index 67a02bad50b6..704e27911f5e 100644 --- a/metadata/md5-cache/sys-apps/busybox-1.29.0 +++ b/metadata/md5-cache/sys-apps/busybox-1.29.0 @@ -11,5 +11,9 @@ REQUIRED_USE=pam? ( !static ) RESTRICT=test SLOT=0 SRC_URI=https://www.busybox.net/downloads/busybox-1.29.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f787e45efc4b8a7c7fc8e201e4eb105a diff --git a/metadata/md5-cache/sys-apps/busybox-1.29.3 b/metadata/md5-cache/sys-apps/busybox-1.29.3 index 9644d27052e2..4063520d7baa 100644 --- a/metadata/md5-cache/sys-apps/busybox-1.29.3 +++ b/metadata/md5-cache/sys-apps/busybox-1.29.3 @@ -11,5 +11,9 @@ REQUIRED_USE=pam? ( !static ) RESTRICT=test SLOT=0 SRC_URI=https://www.busybox.net/downloads/busybox-1.29.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=cbe22c693cb932b2363a942ab926ce8d diff --git a/metadata/md5-cache/sys-apps/busybox-1.30.1 b/metadata/md5-cache/sys-apps/busybox-1.30.1 index 958851fc66d0..c5068168253f 100644 --- a/metadata/md5-cache/sys-apps/busybox-1.30.1 +++ b/metadata/md5-cache/sys-apps/busybox-1.30.1 @@ -11,5 +11,9 @@ REQUIRED_USE=pam? ( !static ) RESTRICT=test SLOT=0 SRC_URI=https://www.busybox.net/downloads/busybox-1.30.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=cbe22c693cb932b2363a942ab926ce8d diff --git a/metadata/md5-cache/sys-apps/busybox-1.31.0 b/metadata/md5-cache/sys-apps/busybox-1.31.0 index 85fed5127f65..5a71e119bdc2 100644 --- a/metadata/md5-cache/sys-apps/busybox-1.31.0 +++ b/metadata/md5-cache/sys-apps/busybox-1.31.0 @@ -11,5 +11,9 @@ REQUIRED_USE=pam? ( !static ) RESTRICT=test SLOT=0 SRC_URI=https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=df140ba8cc4987e66c4c9071066be11c diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999 index 7a40bdba07e0..71b554b89197 100644 --- a/metadata/md5-cache/sys-apps/busybox-9999 +++ b/metadata/md5-cache/sys-apps/busybox-9999 @@ -10,5 +10,9 @@ RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev REQUIRED_USE=pam? ( !static ) RESTRICT=test SLOT=0 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=df140ba8cc4987e66c4c9071066be11c diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.24 b/metadata/md5-cache/sys-apps/fakeroot-1.24 index e424a1c9fb77..e3a0641281f4 100644 --- a/metadata/md5-cache/sys-apps/fakeroot-1.24 +++ b/metadata/md5-cache/sys-apps/fakeroot-1.24 @@ -9,5 +9,9 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-lin LICENSE=GPL-3 SLOT=0 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.24.orig.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=cac7d9b96e20c835fb527a8eaf0103af diff --git a/metadata/md5-cache/sys-apps/flock-2.19 b/metadata/md5-cache/sys-apps/flock-2.19 index c230d900188c..aedcb59ebfd2 100644 --- a/metadata/md5-cache/sys-apps/flock-2.19 +++ b/metadata/md5-cache/sys-apps/flock-2.19 @@ -8,5 +8,9 @@ KEYWORDS=~amd64-fbsd ~x86-fbsd LICENSE=MIT SLOT=0 SRC_URI=http://www.zonov.org/flock/flock-2.19.tar.gz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=c1a677e4bf7aef1df7ca74b8b9a188a6 diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1 b/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1 index 3554ec709c15..4901ab4ae033 100644 --- a/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1 +++ b/metadata/md5-cache/sys-apps/hwloc-1.11.2-r1 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=>=sys-libs/ncurses-5.9-r3:0[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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,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(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[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(-)?] >=x11-libs/libpciaccess-0.13.1-r1[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(-)?] ) plugins? ( dev-libs/libltdl:0[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(-)?] ) numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) SLOT=0/5 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e cuda bb861e5221b7272ac90c2f12791c1e66 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e cuda bb861e5221b7272ac90c2f12791c1e66 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=b980486fb81aa971f728a841c7e51c63 diff --git a/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1 b/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1 index 9f09f70da366..921832877184 100644 --- a/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1 +++ b/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1 @@ -10,5 +10,10 @@ LICENSE=GPL-2 RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) SLOT=0 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-5.2.0.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=919fcac476bedd18c36b650ed83568a2 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=e6d13c2dbb6d2762e055a23fe50b03c8 +>>>>>>> next diff --git a/metadata/md5-cache/sys-apps/iproute2-5.3.0 b/metadata/md5-cache/sys-apps/iproute2-5.3.0 index f8b9f201c029..b677025f41b9 100644 --- a/metadata/md5-cache/sys-apps/iproute2-5.3.0 +++ b/metadata/md5-cache/sys-apps/iproute2-5.3.0 @@ -10,5 +10,9 @@ LICENSE=GPL-2 RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) SLOT=0 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-5.3.0.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=738a3540a1be42e4af796ed468eaa4b4 diff --git a/metadata/md5-cache/sys-apps/nix-2.2.2 b/metadata/md5-cache/sys-apps/nix-2.2.2 index de9e276a5e3c..f36ebda0f4e8 100644 --- a/metadata/md5-cache/sys-apps/nix-2.2.2 +++ b/metadata/md5-cache/sys-apps/nix-2.2.2 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils sys-apps/busybox[static] dev-db/sqlite dev-libs/editline:0= dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) SLOT=0 SRC_URI=http://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=06e63e5051cb51685e77e7fc81820db6 diff --git a/metadata/md5-cache/sys-apps/nix-2.3 b/metadata/md5-cache/sys-apps/nix-2.3 index cc503933665f..9d71ad9faeb8 100644 --- a/metadata/md5-cache/sys-apps/nix-2.3 +++ b/metadata/md5-cache/sys-apps/nix-2.3 @@ -10,5 +10,9 @@ LICENSE=LGPL-2.1 RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils sys-apps/busybox[static] dev-db/sqlite dev-libs/editline:0= dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) SLOT=0 SRC_URI=http://nixos.org/releases/nix/nix-2.3/nix-2.3.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=5fd1851e7f8bc0370d3143bbb5ffb0fb diff --git a/metadata/md5-cache/sys-apps/systemd-242-r7 b/metadata/md5-cache/sys-apps/systemd-242-r7 index 0071080d9680..0f4ac21c85cf 100644 --- a/metadata/md5-cache/sys-apps/systemd-242-r7 +++ b/metadata/md5-cache/sys-apps/systemd-242-r7 @@ -13,5 +13,9 @@ REQUIRED_USE=importd? ( curl gcrypt lzma ) RESTRICT=!test? ( test ) SLOT=0/2 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz +<<<<<<< HEAD +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 756a09f72c4cdbb55f2694c95f1e0860 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 +======= _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 756a09f72c4cdbb55f2694c95f1e0860 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 +>>>>>>> next _md5_=2b1a350776281effd2d5165ae3b6b961 diff --git a/metadata/md5-cache/sys-apps/texinfo-6.7 b/metadata/md5-cache/sys-apps/texinfo-6.7 index 000914e7335f..6e91cd93ce22 100644 --- a/metadata/md5-cache/sys-apps/texinfo-6.7 +++ b/metadata/md5-cache/sys-apps/texinfo-6.7 @@ -9,5 +9,9 @@ LICENSE=GPL-3 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/perl ) !standalone? ( dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode ) nls? ( virtual/libintl ) SLOT=0 SRC_URI=mirror://gnu/texinfo/texinfo-6.7.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=b693bae035aa04de23e0931ced052bd9 diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1 index e9a798d767e3..f2078026fac6 100644 --- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1 +++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.94-r1 @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=>=dev-libs/openssl-0.9.6g:= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp SLOT=0 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.94.tgz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=c68e713d41a0455649aeb865f124b4d5 diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.97 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.97 index fababb2f15c2..a7d0923e4231 100644 --- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.97 +++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.97 @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=>=dev-libs/openssl-0.9.8z_p8:= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp SLOT=0 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.97.tgz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=56cc1d4046f35311ae9c2dc100715648 diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b b/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b index 5e568bcc1749..dedd9af92ea9 100644 --- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b +++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.98b @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=dev-libs/openssl:0= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp SLOT=0 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.98b.tgz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=fedd1715f2b23c8d581a9ef23e5c5a55 diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99 b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99 index ea93ba440d86..cfb2af31b413 100644 --- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99 +++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99 @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=dev-libs/openssl:= net-libs/libnsl perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp SLOT=0 SRC_URI=http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99.tgz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=4ecbd01c040d2b486b34ac48a565ab90 diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e index a36d439ff2e3..8c438829332f 100644 --- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e +++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp SLOT=0 SRC_URI=https://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99e.tgz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 +>>>>>>> next _md5_=a467ae472cd07bea87479fc9c0e67cf3 diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 index 4589b05c23ff..7831d557ef92 100644 --- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 +++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 @@ -10,5 +10,9 @@ RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp ) RESTRICT=test SLOT=0 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff19.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=b796e606aaae652edffa5f1f4cb6c824 diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz Binary files differindex 1355a4e7c136..be2456b28960 100644 --- a/metadata/md5-cache/sys-auth/Manifest.gz +++ b/metadata/md5-cache/sys-auth/Manifest.gz diff --git a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2 b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2 index 1e7add9b5618..b4e4bb4dbb6b 100644 --- a/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2 +++ b/metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2 @@ -9,5 +9,9 @@ LICENSE=GPL-2+ RDEPEND=virtual/pam SLOT=0 SRC_URI=http://0pointer.de/lennart/projects/pam_dotfile/pam_dotfile-0.7.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=7f0edba8dd013e87a70a00fef1bc048c diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 index 9497284d8114..41759724b3d4 100644 --- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 +++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=virtual/libusb:0 pam? ( virtual/pam ) SLOT=0 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=875f713a0b579755919c203057995ada diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz Binary files differindex 9e0bc0409f56..4818854356fb 100644 --- a/metadata/md5-cache/sys-block/Manifest.gz +++ b/metadata/md5-cache/sys-block/Manifest.gz diff --git a/metadata/md5-cache/sys-block/kvpm-0.9.10-r1 b/metadata/md5-cache/sys-block/kvpm-0.9.10-r1 index 6ba24f7d8c11..5accb831eac8 100644 --- a/metadata/md5-cache/sys-block/kvpm-0.9.10-r1 +++ b/metadata/md5-cache/sys-block/kvpm-0.9.10-r1 @@ -10,5 +10,9 @@ LICENSE=GPL-3 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.10.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=0dca7e988f43e2cb2189eb406626b8d2 diff --git a/metadata/md5-cache/sys-block/partitionmanager-4.0.0 b/metadata/md5-cache/sys-block/partitionmanager-4.0.0 index a2854f88a612..698984b4f9b6 100644 --- a/metadata/md5-cache/sys-block/partitionmanager-4.0.0 +++ b/metadata/md5-cache/sys-block/partitionmanager-4.0.0 @@ -10,5 +10,9 @@ LICENSE=GPL-3 RDEPEND=>=kde-frameworks/kconfig-5.56:5 >=kde-frameworks/kconfigwidgets-5.56:5 >=kde-frameworks/kcoreaddons-5.56:5 >=kde-frameworks/kcrash-5.56:5 >=kde-frameworks/kdbusaddons-5.56:5 >=kde-frameworks/ki18n-5.56:5 >=kde-frameworks/kiconthemes-5.56:5 >=kde-frameworks/kio-5.56:5 >=kde-frameworks/kjobwidgets-5.56:5 >=kde-frameworks/kwidgetsaddons-5.56:5 >=kde-frameworks/kxmlgui-5.56:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-libs/kpmcore-4.0.0:5= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.56:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/partitionmanager/4.0.0/src/partitionmanager-4.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e5d3c5920b004d2784167318c3725d80 diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz Binary files differindex 842e274663b2..d0dbf71dc482 100644 --- a/metadata/md5-cache/sys-cluster/Manifest.gz +++ b/metadata/md5-cache/sys-cluster/Manifest.gz diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.4 b/metadata/md5-cache/sys-cluster/ceph-14.2.4 index 0cdfe2badd03..03412f5d06a7 100644 --- a/metadata/md5-cache/sys-cluster/ceph-14.2.4 +++ b/metadata/md5-cache/sys-cluster/ceph-14.2.4 @@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe RESTRICT=test? ( userpriv ) test SLOT=0 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.4.tar.gz -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c distutils-r1 9838160d624a44b2d56d1266a69fd473 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 user 00484e1be1aac73e24fca1c99557a7d6 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=185a80dc3eb053991538ca61a8429ebd diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.14.7 b/metadata/md5-cache/sys-cluster/kubectl-1.14.7 index 042f66a1c321..3ee10d4597f6 100644 --- a/metadata/md5-cache/sys-cluster/kubectl-1.14.7 +++ b/metadata/md5-cache/sys-cluster/kubectl-1.14.7 @@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10 DESCRIPTION=CLI to run commands against Kubernetes clusters EAPI=6 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io -KEYWORDS=amd64 +KEYWORDS=~amd64 LICENSE=Apache-2.0 RESTRICT=test SLOT=0 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.7.tar.gz -> kubernetes-1.14.7.tar.gz _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-build dc25bafa8fc1305a4de66a0a448472e7 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a -_md5_=0c51e2a903ad3c11bc37079e6182a568 +_md5_=1967dc9a3a57363631512f7d5e70d87f diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz Binary files differindex 3a03256f0f47..7e4a3e2f730e 100644 --- a/metadata/md5-cache/sys-devel/Manifest.gz +++ b/metadata/md5-cache/sys-devel/Manifest.gz diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0.9999 b/metadata/md5-cache/sys-devel/clang-10.0.0.9999 index c8dac072c40b..766222818869 100644 --- a/metadata/md5-cache/sys-devel/clang-10.0.0.9999 +++ b/metadata/md5-cache/sys-devel/clang-10.0.0.9999 @@ -12,5 +12,9 @@ RDEPEND=~sys-devel/llvm-10.0.0.9999:10=[debug=,llvm_targets_AArch64?,llvm_target REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 ) RESTRICT=!test? ( test ) SLOT=10 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4476b4ea4de046860d5aa640d51f0f61 diff --git a/metadata/md5-cache/sys-devel/clang-8.0.1 b/metadata/md5-cache/sys-devel/clang-8.0.1 index 2c4a643d9e8c..891a8f6bf8f6 100644 --- a/metadata/md5-cache/sys-devel/clang-8.0.1 +++ b/metadata/md5-cache/sys-devel/clang-8.0.1 @@ -12,5 +12,9 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD RESTRICT=!test? ( test ) SLOT=8 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/clang-tools-extra-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.1-manpages.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=af5fc8149ad0d5ebaa1456fd8a96c00e diff --git a/metadata/md5-cache/sys-devel/clang-9.0.0 b/metadata/md5-cache/sys-devel/clang-9.0.0 index 3949fb07597a..4a4740dbff24 100644 --- a/metadata/md5-cache/sys-devel/clang-9.0.0 +++ b/metadata/md5-cache/sys-devel/clang-9.0.0 @@ -13,5 +13,9 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 RESTRICT=!test? ( test ) SLOT=9 SRC_URI=https://releases.llvm.org/9.0.0/cfe-9.0.0.src.tar.xz https://releases.llvm.org/9.0.0/clang-tools-extra-9.0.0.src.tar.xz test? ( https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-9.0.0-manpages.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=804030aba78027b1c0152a5410a1f69b diff --git a/metadata/md5-cache/sys-devel/clang-9.0.0.9999 b/metadata/md5-cache/sys-devel/clang-9.0.0.9999 index 2a9fe788cb68..dcccf688a665 100644 --- a/metadata/md5-cache/sys-devel/clang-9.0.0.9999 +++ b/metadata/md5-cache/sys-devel/clang-9.0.0.9999 @@ -12,5 +12,9 @@ RDEPEND=~sys-devel/llvm-9.0.0.9999:9=[debug=,llvm_targets_AArch64?,llvm_targets_ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) RESTRICT=!test? ( test ) SLOT=9 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=b96a6a8fdc2b144363ccb3394afcbb97 diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.3 b/metadata/md5-cache/sys-devel/distcc-3.3.3 index 12c1d7634977..b2b4b1853277 100644 --- a/metadata/md5-cache/sys-devel/distcc-3.3.3 +++ b/metadata/md5-cache/sys-devel/distcc-3.3.3 @@ -11,5 +11,9 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 RESTRICT=test SLOT=0 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.3/distcc-3.3.3.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=81af63eb6045a29c7274f1cbc287b1d0 diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 index 56fd05f8aa56..c4c7f465841a 100644 --- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 +++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 @@ -4,12 +4,21 @@ DESCRIPTION=The GNU Compiler Collection EAPI=5 HOMEPAGE=https://gcc.gnu.org/ IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd +======= KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd +>>>>>>> next LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) RESTRICT=strip SLOT=6.5.0 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=b479b17fb5b064edba29e93f72b575e6 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=fbf94a79841dcd305b0241c6fb4c2cf2 +>>>>>>> next diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 index d71c58ba2cf3..cf5404a9e674 100644 --- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 +++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 @@ -4,12 +4,21 @@ DESCRIPTION=The GNU Compiler Collection EAPI=5 HOMEPAGE=https://gcc.gnu.org/ IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos +======= KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos +>>>>>>> next LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) RESTRICT=strip SLOT=7.4.0 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=3df384165d11ffcd4c244f331f427f4e +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf _md5_=53c8c4633b464145666ecc6631de6706 +>>>>>>> next diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r2 index 97bd6df0bab6..b7c64c2f1d9d 100644 --- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r2 +++ b/metadata/md5-cache/sys-devel/gcc-8.3.0-r2 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4 RESTRICT=strip SLOT=8.3.0 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-2.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=36a76943ab5c0ef9b4d877920e031e04 diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.2.0-r1 index d8f2638fbd77..0e148eec67bc 100644 --- a/metadata/md5-cache/sys-devel/gcc-9.2.0-r1 +++ b/metadata/md5-cache/sys-devel/gcc-9.2.0-r1 @@ -11,5 +11,9 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4 RESTRICT=strip SLOT=9.2.0 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-2.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain f10289dcdd815611b6e6ae00c98f7922 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=73dbfd7e03e5682449a37f7fbc4662c8 diff --git a/metadata/md5-cache/sys-devel/gdb-8.3.1 b/metadata/md5-cache/sys-devel/gdb-8.3.1 index 2717ee09ca33..d45df841b7d1 100644 --- a/metadata/md5-cache/sys-devel/gdb-8.3.1 +++ b/metadata/md5-cache/sys-devel/gdb-8.3.1 @@ -12,5 +12,9 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_ RESTRICT=hppa? ( test ) ia64? ( test ) SLOT=0 SRC_URI=mirror://gnu/gdb/gdb-8.3.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.3.1.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=fe49fbee4de0c35c79314f2dc8a36664 diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0.9999 b/metadata/md5-cache/sys-devel/lld-10.0.0.9999 index a5a74916281d..d4253e0a4f40 100644 --- a/metadata/md5-cache/sys-devel/lld-10.0.0.9999 +++ b/metadata/md5-cache/sys-devel/lld-10.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=~sys-devel/llvm-10.0.0.9999 RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=75d903aeea80845b589785ecf6deda27 diff --git a/metadata/md5-cache/sys-devel/lld-8.0.1 b/metadata/md5-cache/sys-devel/lld-8.0.1 index 11037e3c2c39..501010280844 100644 --- a/metadata/md5-cache/sys-devel/lld-8.0.1 +++ b/metadata/md5-cache/sys-devel/lld-8.0.1 @@ -10,5 +10,9 @@ RDEPEND=~sys-devel/llvm-8.0.1 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lld-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=2b0c47e2b370b30fb58f0d897a9a3b1d diff --git a/metadata/md5-cache/sys-devel/lld-9.0.0 b/metadata/md5-cache/sys-devel/lld-9.0.0 index 25036896a79f..07aa989d8a3f 100644 --- a/metadata/md5-cache/sys-devel/lld-9.0.0 +++ b/metadata/md5-cache/sys-devel/lld-9.0.0 @@ -11,5 +11,9 @@ RDEPEND=~sys-devel/llvm-9.0.0 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://releases.llvm.org/9.0.0/lld-9.0.0.src.tar.xz test? ( https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4aa51790886a45512cebb13231f5ed1b diff --git a/metadata/md5-cache/sys-devel/lld-9.0.0.9999 b/metadata/md5-cache/sys-devel/lld-9.0.0.9999 index a8fc0931f8b9..a021612493a4 100644 --- a/metadata/md5-cache/sys-devel/lld-9.0.0.9999 +++ b/metadata/md5-cache/sys-devel/lld-9.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=~sys-devel/llvm-9.0.0.9999 RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7739aedae874c6643fe932a19bed49f7 diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-10.0.0.9999 index 242733f0d3b1..00290cb61363 100644 --- a/metadata/md5-cache/sys-devel/llvm-10.0.0.9999 +++ b/metadata/md5-cache/sys-devel/llvm-10.0.0.9999 @@ -12,5 +12,9 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 ) RESTRICT=!test? ( test ) SLOT=10 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f389623d0a8ec9e242310ba83c7d74b7 diff --git a/metadata/md5-cache/sys-devel/llvm-8.0.1 b/metadata/md5-cache/sys-devel/llvm-8.0.1 index 76e8c173fec3..f4e42b6a8238 100644 --- a/metadata/md5-cache/sys-devel/llvm-8.0.1 +++ b/metadata/md5-cache/sys-devel/llvm-8.0.1 @@ -12,5 +12,9 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm RESTRICT=!test? ( test ) SLOT=8 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.1-manpages.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9f1a888dec29d592a84faf07277f446e diff --git a/metadata/md5-cache/sys-devel/llvm-9.0.0 b/metadata/md5-cache/sys-devel/llvm-9.0.0 index 35bb360ca8ea..2441f88ab2d8 100644 --- a/metadata/md5-cache/sys-devel/llvm-9.0.0 +++ b/metadata/md5-cache/sys-devel/llvm-9.0.0 @@ -13,5 +13,9 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm RESTRICT=!test? ( test ) SLOT=9 SRC_URI=https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-9.0.0-manpages.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ef439eb3428855986df120faf009f362 diff --git a/metadata/md5-cache/sys-devel/llvm-9.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-9.0.0.9999 index c1efc31a4807..0e8375ca1eec 100644 --- a/metadata/md5-cache/sys-devel/llvm-9.0.0.9999 +++ b/metadata/md5-cache/sys-devel/llvm-9.0.0.9999 @@ -12,5 +12,9 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) RESTRICT=!test? ( test ) SLOT=9 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=27379be2c6765fbe7c86c3723c16569f diff --git a/metadata/md5-cache/sys-freebsd/Manifest.gz b/metadata/md5-cache/sys-freebsd/Manifest.gz Binary files differindex 32bac9fd367e..e5e9651c935c 100644 --- a/metadata/md5-cache/sys-freebsd/Manifest.gz +++ b/metadata/md5-cache/sys-freebsd/Manifest.gz diff --git a/metadata/md5-cache/sys-freebsd/boot0-11.1 b/metadata/md5-cache/sys-freebsd/boot0-11.1 index fe82445d1526..168abce3339f 100644 --- a/metadata/md5-cache/sys-freebsd/boot0-11.1 +++ b/metadata/md5-cache/sys-freebsd/boot0-11.1 @@ -8,5 +8,9 @@ KEYWORDS=~amd64-fbsd ~x86-fbsd LICENSE=BSD SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=e0de92bbcd0b82521d621733363468f9 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1 index 28066a43b702..d16c75506da0 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-bin-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND==sys-freebsd/freebsd-lib-11.1* >=dev-libs/libedit-20120311.3.0-r1 sys-libs/ncurses:0= sys-apps/ed !app-misc/realpath !<sys-freebsd/freebsd-ubin-8 SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=cd2a0577d7287c887f3adbc3394f3f7f diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-11.1 index a69369cd3ba4..ee96f1d3d424 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-11.1 @@ -9,5 +9,9 @@ LICENSE=CDDL GPL-2 RDEPEND==sys-freebsd/freebsd-lib-11.1* build? ( sys-apps/baselayout ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=bc12a9f2f71ccb9057f2f6ef6a625470 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.1 index 2733b69b7841..617c238313e3 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.1 @@ -9,5 +9,9 @@ LICENSE=CDDL GPL-2 RDEPEND==sys-freebsd/freebsd-lib-9.1* =sys-freebsd/freebsd-libexec-9.1* build? ( sys-apps/baselayout ) dev-libs/libelf SLOT=0 SRC_URI=mirror://gentoo/freebsd-cddl-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-sbin-9.1.tar.bz2 mirror://gentoo/freebsd-sys-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-include-9.1.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=a6fb5e39d7c3c45c2821bd9b34f4376a diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1-r1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1-r1 index 14966f720575..e8f8d95281c6 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1-r1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-11.1-r1 @@ -9,5 +9,9 @@ LICENSE=BSD GPL-2 zfs? ( CDDL ) RDEPEND=ssl? ( dev-libs/openssl:0= ) kerberos? ( app-crypt/heimdal ) pam? ( virtual/pam ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-11.1* ) >=dev-libs/expat-2.0.1 >=dev-util/dialog-1.2.20150225 !sys-freebsd/freebsd-libexec !sys-libs/libutempter !dev-libs/libelf !dev-libs/libexecinfo !dev-libs/libiconv !sys-freebsd/freebsd-headers =sys-freebsd/freebsd-share-11.1* xinetd? ( sys-apps/xinetd ) >=virtual/libiconv-0-r2 SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=61ee5f61c85fd36fbdf8807120d8ae85 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 index 924d8eacf364..69db81779ec3 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 +++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/heimdal ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-9.1* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter !sys-freebsd/freebsd-headers SLOT=0 SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-crypto-9.1.tar.bz2 mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=188134e9c92ba576750894117ef6449b diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2 index 4bed2878c5f7..960143a1a9ba 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2 +++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND==sys-freebsd/freebsd-lib-9.1* >=sys-freebsd/freebsd-lib-9.1-r11[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(-)?] pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=b01384f8a9ecea8157d6f7bdf5e76d7b diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1 index 171ce8d21447..418ddb887800 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD RESTRICT=strip SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=57d45589197a33aeb91b1b3d1e31cc25 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1 index c6c02f4824ab..82ffe1a91cb8 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-pam-modules-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=>=sys-auth/openpam-20050201-r1 kerberos? ( dev-libs/openssl:0= virtual/krb5 ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=7cb5b08b909a6de9dad4abff681fae20 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-pf-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-pf-11.1 index 5029fbe52b8b..7b9062de0c8c 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-pf-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-pf-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD RDEPEND=net-libs/libpcap SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=01593d9a1b299b4c9ede5f99c052e472 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-rescue-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-rescue-11.1 index d409a0ce19f6..ae94c20ed956 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-rescue-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-rescue-11.1 @@ -8,5 +8,9 @@ KEYWORDS=~amd64-fbsd ~x86-fbsd LICENSE=BSD zfs? ( CDDL ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=2748a1439ba39dd4bd7ba053a1d86ed1 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1 index 95f3c81ad947..d1013decee3f 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-sbin-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-11.1*[ipv6?,atm?,netware?] zfs? ( =sys-freebsd/freebsd-cddl-11.1* ) >=dev-libs/expat-2.0.1 ssl? ( dev-libs/openssl:0= ) >=dev-libs/libedit-20120311.3.0-r1 sys-libs/readline:0= || ( sys-process/cronie sys-process/vixie-cron ) atm? ( net-analyzer/bsnmp ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=36cf6b3c9dcdf80c89f4257e1573b8db diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1 index 308ce8045683..ec84cc68e664 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1 @@ -10,5 +10,9 @@ RDEPEND=sys-apps/miscfiles RESTRICT=strip SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=1c2429fe7daf8f02c6d26536541d56cd diff --git a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1_p1 b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1_p1 index 9a3ad63db94f..1b78b79a09e6 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-share-11.1_p1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-share-11.1_p1 @@ -10,5 +10,9 @@ RDEPEND=sys-apps/miscfiles RESTRICT=strip SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=b9564511a075d1595da5b4fc5ff68238 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2 b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2 index c36986d80a83..5b85ea9ab66e 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2 +++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p2 @@ -10,5 +10,9 @@ RDEPEND=dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-d RESTRICT=strip binchecks SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz https://security.freebsd.org/patches/SA-17:08/ptrace.patch -> freebsd-sources-SA-1708-ptrace.patch https://security.freebsd.org/patches/SA-17:10/kldstat.patch -> freebsd-sources-SA-1710-kldstat.patch https://security.freebsd.org/patches/EN-17:07/vnet.patch -> freebsd-sources-EN-1707-vnet.patch https://security.freebsd.org/patches/EN-17:08/pf.patch -> freebsd-sources-EN-1708-pf.patch +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=2cde27dba3836cdf37ee4942551167d9 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p3 index d4a38b48e7a2..ca20d2028d1f 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p3 +++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-11.1_p3 @@ -10,5 +10,9 @@ RDEPEND=dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-d RESTRICT=strip binchecks SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz https://dev.gentoo.org/~mgorny/dist/freebsd-sources-11.1_p3-patchset.tar.xz https://security.freebsd.org/patches/SA-17:08/ptrace.patch -> freebsd-sources-SA-1708-ptrace.patch https://security.freebsd.org/patches/SA-17:10/kldstat.patch -> freebsd-sources-SA-1710-kldstat.patch https://security.freebsd.org/patches/EN-17:07/vnet.patch -> freebsd-sources-EN-1707-vnet.patch https://security.freebsd.org/patches/EN-17:08/pf.patch -> freebsd-sources-EN-1708-pf.patch https://security.freebsd.org/patches/SA-18:01/ipsec-11.patch -> freebsd-sources-SA-1801-ipsec-11.patch https://security.freebsd.org/patches/SA-18:04/vt.patch -> freebsd-sources-SA-1804-vt.patch https://security.freebsd.org/patches/SA-18:05/ipsec.patch -> freebsd-sources-SA-1805-ipsec.patch https://security.freebsd.org/patches/EN-18:04/mem.11.patch -> freebsd-sources-EN-1804-mem.11.patch https://security.freebsd.org/patches/EN-18:05/mem.11.1.patch -> freebsd-sources-EN-1805-mem.11.1.patch https://security.freebsd.org/patches/SA-18:06/debugreg.11.1.patch -> freebsd-sources-SA-1806-debugreg.11.1.patch https://security.freebsd.org/patches/SA-18:07/lazyfpu-11.patch -> freebsd-sources-SA-1807-lazyfpu-11.patch https://security.freebsd.org/patches/EN-18:07/pmap.patch -> freebsd-sources-EN-1807-pmap.patch https://security.freebsd.org/patches/SA-18:09/l1tf-11.1.patch -> freebsd-sources-SA-1809-l1tf-11.1.patch +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=ad7eb2204762d2c61e0ff5861f2eb154 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1 index 6a30cbef0c56..bd349ac39e7a 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl:0= ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9:0= !sys-process/fuser-bsd !dev-util/csup !dev-libs/libiconv !sys-freebsd/freebsd-contrib >=sys-auth/pambase-20080219.1 sys-process/cronbase SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=28c7ea70286108df38d3584e3f302aec diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1-r1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1-r1 index 124b7a63083a..cc3dbca6d9a3 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1-r1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-11.1-r1 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl:0= ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9:0= !sys-process/fuser-bsd !dev-util/csup !dev-libs/libiconv !sys-apps/man !sys-apps/man-db !sys-freebsd/freebsd-contrib >=sys-auth/pambase-20080219.1 sys-process/cronbase SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=4fed366bf265c90d9a45f179bfcb47ea diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2 index 8f4996dea107..623c51f2f63f 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2 +++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase SLOT=0 SRC_URI=mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=637d589c33e5061915ead5dc4a88c3af diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3 index 76b8322cc24e..34b211a4fa05 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3 +++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase SLOT=0 SRC_URI=mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 pam 756a09f72c4cdbb55f2694c95f1e0860 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=0f6bf44f4be3a5d11e3700270d317e86 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1 index 798f5394f2a3..e36068dd16b1 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,netware?] build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl:0 ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog >=dev-libs/libedit-20120311.3.0-r1 net-libs/libpcap kerberos? ( app-crypt/heimdal ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=3572a894ee787c75f51e419cc289b264 diff --git a/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1 b/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1 index 2f3d4fe82381..a255b7c21956 100644 --- a/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1 +++ b/metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1 @@ -9,5 +9,9 @@ LICENSE=BSD zfs? ( CDDL ) RDEPEND==sys-freebsd/freebsd-lib-11.1*[usb?,bluetooth?,netware?] build? ( sys-apps/baselayout ) ssl? ( dev-libs/openssl:0 ) >=app-arch/libarchive-3 sys-apps/tcp-wrappers dev-util/dialog >=dev-libs/libedit-20120311.3.0-r1 net-libs/libpcap kerberos? ( app-crypt/heimdal ) SLOT=0 SRC_URI=mirror://gentoo/freebsd-src-11.1.tar.xz +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 freebsd c405b05fb320b791fcfb2afc89ec07c2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=d0cecf80aee9fb2cc506f9882ded44ac diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz Binary files differindex fdf92f60f095..3220473b928e 100644 --- a/metadata/md5-cache/sys-fs/Manifest.gz +++ b/metadata/md5-cache/sys-fs/Manifest.gz diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.4 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.4 index aa4a9ae5369f..da36333545a7 100644 --- a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.4 +++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.4 @@ -5,10 +5,19 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities EAPI=7 HOMEPAGE=http://e2fsprogs.sourceforge.net/ IUSE=cron fuse nls static-libs elibc_FreeBSD split-usr +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint +======= KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint +>>>>>>> next LICENSE=GPL-2 BSD RDEPEND=~sys-libs/e2fsprogs-libs-1.45.4 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) SLOT=0 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.4.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.4/e2fsprogs-1.45.4.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +_md5_=8a67e5da8722ccc64037d0c2adcf3fe5 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 _md5_=f240814335df12d19b16eaaa9a856d56 +>>>>>>> next diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.13 b/metadata/md5-cache/sys-fs/zfs-0.7.13 index 1f22af14cbf8..78e9ecbf1072 100644 --- a/metadata/md5-cache/sys-fs/zfs-0.7.13 +++ b/metadata/md5-cache/sys-fs/zfs-0.7.13 @@ -11,5 +11,9 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 RESTRICT=test SLOT=0 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=895cabeda373bcaa219c86c4acef5ed6 diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.13 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.13 index 821ee89c4f02..1c7aac2edbb0 100644 --- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.13 +++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.13 @@ -10,5 +10,9 @@ RDEPEND==sys-kernel/spl-0.7.13* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kerne RESTRICT=debug? ( strip ) test SLOT=0 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=5347874214b02c994961997e1722e961 diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz Binary files differindex db5de67b2b51..dc3c3c12206b 100644 --- a/metadata/md5-cache/sys-kernel/Manifest.gz +++ b/metadata/md5-cache/sys-kernel/Manifest.gz diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.13 b/metadata/md5-cache/sys-kernel/spl-0.7.13 index ce4e33110ed2..d28e0d11bda0 100644 --- a/metadata/md5-cache/sys-kernel/spl-0.7.13 +++ b/metadata/md5-cache/sys-kernel/spl-0.7.13 @@ -11,5 +11,9 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 RESTRICT=debug? ( strip ) test SLOT=0 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/spl-0.7.13.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=efee4a5a953d8c7ae7f5ff6a7f771a23 diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz Binary files differindex 7b412b3f0180..c09ce389f709 100644 --- a/metadata/md5-cache/sys-libs/Manifest.gz +++ b/metadata/md5-cache/sys-libs/Manifest.gz diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999 index f5bff9b5bca9..0ec000002682 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999 +++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) PROPERTIES=live RESTRICT=!test? ( test ) !clang? ( test ) SLOT=10.0.0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=245b8369cf1d41795c2d6541265372fa diff --git a/metadata/md5-cache/sys-libs/compiler-rt-8.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-8.0.1 index 9bbb244c3d37..e60bc583c9cb 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-8.0.1 +++ b/metadata/md5-cache/sys-libs/compiler-rt-8.0.1 @@ -9,5 +9,9 @@ LICENSE=|| ( UoI-NCSA MIT ) RESTRICT=!test? ( test ) !clang? ( test ) SLOT=8.0.1 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/compiler-rt-8.0.1.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=86d248534f9bfe8c71dfb3bc739dd6c6 diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-9.0.0 index 05b224300903..f596d6d45d53 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-9.0.0 +++ b/metadata/md5-cache/sys-libs/compiler-rt-9.0.0 @@ -10,5 +10,9 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) RESTRICT=!test? ( test ) !clang? ( test ) SLOT=9.0.0 SRC_URI=https://releases.llvm.org/9.0.0/compiler-rt-9.0.0.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=a6d013b21c0d29895e1f2943f56dccb6 diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-9.0.0.9999 index 1970a028c181..2c99998a7558 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-9.0.0.9999 +++ b/metadata/md5-cache/sys-libs/compiler-rt-9.0.0.9999 @@ -9,5 +9,9 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) PROPERTIES=live RESTRICT=!test? ( test ) !clang? ( test ) SLOT=9.0.0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=6bca171c70091360551f92e023b89a52 diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999 index 6af1b2ee8ae6..e134b0feead7 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999 +++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) ) RESTRICT=!test? ( test ) !clang? ( test ) SLOT=10.0.0 +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=90444d786d0859190a8d468a5536bf4a diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1 index f2289f8e5b39..d3ae0b2e9a4c 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1 +++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1 @@ -10,5 +10,9 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) ) RESTRICT=!test? ( test ) !clang? ( test ) SLOT=8.0.1 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/compiler-rt-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3c4bafe5cab235a71b415a25329f7b7e diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0 index 822dd812e641..a4a4be351d95 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0 +++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0 @@ -11,5 +11,9 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) ) RESTRICT=!test? ( test ) !clang? ( test ) SLOT=9.0.0 SRC_URI=https://releases.llvm.org/9.0.0/compiler-rt-9.0.0.src.tar.xz test? ( https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f8d442b33552d9cb317002d11cec82fa diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999 index 27c14da90bc6..c6a7672e5ad9 100644 --- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999 +++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) ) RESTRICT=!test? ( test ) !clang? ( test ) SLOT=9.0.0 +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1c353b0fbfe4c9280cc872de88f9e152 diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.4 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.4 index 6f806e5066a5..33487d13c2af 100644 --- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.4 +++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.4 @@ -4,10 +4,18 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem) EAPI=7 HOMEPAGE=http://e2fsprogs.sourceforge.net/ IUSE=static-libs 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 split-usr +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris +======= KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris +>>>>>>> next LICENSE=GPL-2 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 SLOT=0 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.4.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.4/e2fsprogs-1.45.4.tar.xz _eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +<<<<<<< HEAD +_md5_=be3f3ebd51b8dc6e3d41fb43692caac7 +======= _md5_=197788e9cce06530f8da479117a0fdfe +>>>>>>> next diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2 index 96958fc513f1..96ab06eb5318 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.19-r2 +++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f687536b88a87dac28a46cbe620b9609 diff --git a/metadata/md5-cache/sys-libs/glibc-2.24-r4 b/metadata/md5-cache/sys-libs/glibc-2.24-r4 index 2c2d0ba25b39..9711dc030635 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.24-r4 +++ b/metadata/md5-cache/sys-libs/glibc-2.24-r4 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.24-patches-10.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a toolchain-glibc 1a2d0490a5da0e3eeab48401b5d55d9c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a toolchain-glibc 1a2d0490a5da0e3eeab48401b5d55d9c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=f0b1df9cea71df74a81c7d6bb54a5f26 diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11 index 8dbe653a6cfd..186f8092cca6 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.25-r11 +++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a toolchain-glibc 1a2d0490a5da0e3eeab48401b5d55d9c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a toolchain-glibc 1a2d0490a5da0e3eeab48401b5d55d9c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=f232ea080a9c8a78a16ca655dae121d8 diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r7 b/metadata/md5-cache/sys-libs/glibc-2.26-r7 index 9932e0373cf7..4288c64b61af 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.26-r7 +++ b/metadata/md5-cache/sys-libs/glibc-2.26-r7 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-7.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a toolchain-glibc 1a2d0490a5da0e3eeab48401b5d55d9c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a toolchain-glibc 1a2d0490a5da0e3eeab48401b5d55d9c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=6ec2c380da8a2b7a247596975ee683a7 diff --git a/metadata/md5-cache/sys-libs/glibc-2.27-r6 b/metadata/md5-cache/sys-libs/glibc-2.27-r6 index 3e6d49a70a3d..a8370eda2974 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.27-r6 +++ b/metadata/md5-cache/sys-libs/glibc-2.27-r6 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.27.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.27-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=69489c99824a6abe1432ac9f30af1bec diff --git a/metadata/md5-cache/sys-libs/glibc-2.28-r6 b/metadata/md5-cache/sys-libs/glibc-2.28-r6 index 31234b7931a7..d2e98c335384 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.28-r6 +++ b/metadata/md5-cache/sys-libs/glibc-2.28-r6 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.28.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.28-patches-9.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=a723d4197761d43436794ba60da7fd66 diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r2 b/metadata/md5-cache/sys-libs/glibc-2.29-r2 index d4e336777ed2..f64f9144002f 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.29-r2 +++ b/metadata/md5-cache/sys-libs/glibc-2.29-r2 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.29-patches-3.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=7ad017aa34a52ba285204678074865ff diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r4 b/metadata/md5-cache/sys-libs/glibc-2.29-r4 index 016958563d01..ecf33254332a 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.29-r4 +++ b/metadata/md5-cache/sys-libs/glibc-2.29-r4 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.29-patches-5.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=5c8ed1ccc7d5a0ac14db6feb10663fb2 diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r5 b/metadata/md5-cache/sys-libs/glibc-2.29-r5 index f06514d22bce..69b104962ef8 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.29-r5 +++ b/metadata/md5-cache/sys-libs/glibc-2.29-r5 @@ -10,5 +10,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.29-patches-6.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=d43bc5c61dbfc427cbd35abcd814be1c diff --git a/metadata/md5-cache/sys-libs/glibc-2.30 b/metadata/md5-cache/sys-libs/glibc-2.30 index 27a5da3e7b10..31d819fbf9a4 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.30 +++ b/metadata/md5-cache/sys-libs/glibc-2.30 @@ -9,5 +9,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-1.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=1a924217a7b857db11fedbf37577fa1f diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r1 b/metadata/md5-cache/sys-libs/glibc-2.30-r1 index b0f4854bdc2d..2fbf88dd0e12 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.30-r1 +++ b/metadata/md5-cache/sys-libs/glibc-2.30-r1 @@ -9,5 +9,9 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data ) RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-patches-2.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=84a2438bc2201d7689878f4685e4289f diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999 index 540808c5487b..21e81b6c739d 100644 --- a/metadata/md5-cache/sys-libs/glibc-9999 +++ b/metadata/md5-cache/sys-libs/glibc-9999 @@ -11,5 +11,9 @@ PROPERTIES=live RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data ) SLOT=2.2 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-14.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1 +>>>>>>> next _md5_=fed655e5334612d1d06bed43d4c83fc8 diff --git a/metadata/md5-cache/sys-libs/kpmcore-4.0.0 b/metadata/md5-cache/sys-libs/kpmcore-4.0.0 index cd2b8f2300b7..0700ee21c462 100644 --- a/metadata/md5-cache/sys-libs/kpmcore-4.0.0 +++ b/metadata/md5-cache/sys-libs/kpmcore-4.0.0 @@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kauth-5.56:5 >=kde-frameworks/kcoreaddons-5.56:5 >=kde- RESTRICT=test SLOT=5/8 SRC_URI=mirror://kde/stable/kpmcore/4.0.0/src/kpmcore-4.0.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=27f79507b4118cf2749feee2b0f6e898 diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.7.8 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.8 index 20874253ae1d..d8a38eb3bf97 100644 --- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.8 +++ b/metadata/md5-cache/sys-libs/libcap-ng-0.7.8 @@ -11,5 +11,9 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py RESTRICT=test SLOT=0 SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.8.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f42a266fde41b72369bc302965da8f8d diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999 index 7c32220fd4bb..368edd8789dc 100644 --- a/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999 +++ b/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0.9999[libunwind=,static-libs?,abi REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4c5366a43ea45034f26a3060e756376e diff --git a/metadata/md5-cache/sys-libs/libcxx-8.0.1 b/metadata/md5-cache/sys-libs/libcxx-8.0.1 index 537f380588f4..49878bea0f4f 100644 --- a/metadata/md5-cache/sys-libs/libcxx-8.0.1 +++ b/metadata/md5-cache/sys-libs/libcxx-8.0.1 @@ -11,5 +11,9 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt ) RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=dd98472ab5449001e7b4c0601257e117 diff --git a/metadata/md5-cache/sys-libs/libcxx-9.0.0 b/metadata/md5-cache/sys-libs/libcxx-9.0.0 index 730cead9647b..374e1ebe3450 100644 --- a/metadata/md5-cache/sys-libs/libcxx-9.0.0 +++ b/metadata/md5-cache/sys-libs/libcxx-9.0.0 @@ -12,5 +12,9 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt ) RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://releases.llvm.org/9.0.0/libcxx-9.0.0.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=584a1e70d836917d9771319bfe6b0b8d diff --git a/metadata/md5-cache/sys-libs/libcxx-9.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-9.0.0.9999 index f2b18e445886..b4846e84b8ea 100644 --- a/metadata/md5-cache/sys-libs/libcxx-9.0.0.9999 +++ b/metadata/md5-cache/sys-libs/libcxx-9.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-9.0.0.9999[libunwind=,static-libs?,abi_ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=29e7f94a77bbf88c977f7cc72b74aec6 diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999 index 80a71d02bd56..21aec4b79ff4 100644 --- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999 +++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,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(-)?] ) ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=7c3195dbbc5f1853bc975bdc7458fced diff --git a/metadata/md5-cache/sys-libs/libcxxabi-8.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-8.0.1 index 7f055a97c3c9..b43735b115bc 100644 --- a/metadata/md5-cache/sys-libs/libcxxabi-8.0.1 +++ b/metadata/md5-cache/sys-libs/libcxxabi-8.0.1 @@ -10,5 +10,9 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32( RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxxabi-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9f565d8e7beead7865f63df5540e5f5d diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-9.0.0 index 49d1a141e694..364fe28cf35b 100644 --- a/metadata/md5-cache/sys-libs/libcxxabi-9.0.0 +++ b/metadata/md5-cache/sys-libs/libcxxabi-9.0.0 @@ -11,5 +11,9 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32( RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://releases.llvm.org/9.0.0/libcxxabi-9.0.0.src.tar.xz https://releases.llvm.org/9.0.0/libcxx-9.0.0.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=65d99d0c42d397d8fcd4d48abb97614c diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-9.0.0.9999 index 9db7e410ca2d..ad2988b01259 100644 --- a/metadata/md5-cache/sys-libs/libcxxabi-9.0.0.9999 +++ b/metadata/md5-cache/sys-libs/libcxxabi-9.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,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(-)?] ) ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9efb3c94dd1d3755fea7f0c83c06c1d1 diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-10.0.0.9999 index 3e5f7598958b..0c40fd11ff61 100644 --- a/metadata/md5-cache/sys-libs/libomp-10.0.0.9999 +++ b/metadata/md5-cache/sys-libs/libomp-10.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)? REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=043463233ea403c2811719e7abd8cb14 diff --git a/metadata/md5-cache/sys-libs/libomp-8.0.1 b/metadata/md5-cache/sys-libs/libomp-8.0.1 index 5005d3584335..909b755f06af 100644 --- a/metadata/md5-cache/sys-libs/libomp-8.0.1 +++ b/metadata/md5-cache/sys-libs/libomp-8.0.1 @@ -11,5 +11,9 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) ) RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/openmp-8.0.1.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=ca1e5cd9f74ed4b7519916d85a397ebf diff --git a/metadata/md5-cache/sys-libs/libomp-9.0.0 b/metadata/md5-cache/sys-libs/libomp-9.0.0 index ecd9f3626c2e..9ec555fbba06 100644 --- a/metadata/md5-cache/sys-libs/libomp-9.0.0 +++ b/metadata/md5-cache/sys-libs/libomp-9.0.0 @@ -12,5 +12,9 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) ) RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://releases.llvm.org/9.0.0/openmp-9.0.0.src.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=4d96b248609bbf9eeca9b34e0f092d48 diff --git a/metadata/md5-cache/sys-libs/libomp-9.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-9.0.0.9999 index eccd48b40c77..ef57d06d6621 100644 --- a/metadata/md5-cache/sys-libs/libomp-9.0.0.9999 +++ b/metadata/md5-cache/sys-libs/libomp-9.0.0.9999 @@ -11,5 +11,9 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)? REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) ) RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=aecae89a17288ec9948ed93a7f20d1e0 diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999 index 974c5274d16e..bc0547c733f1 100644 --- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999 +++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=!sys-libs/libunwind RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e43829ec5496c116ff54e7eced246caa diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1 index caa39a6400da..5cce9245c799 100644 --- a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1 +++ b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1 @@ -10,5 +10,9 @@ RDEPEND=!sys-libs/libunwind RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libunwind-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxxabi-8.0.1.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=831ce9e295197e8338cf0c32e5648433 diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0 index f74b9b05ae00..b6059e70e2f7 100644 --- a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0 +++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0 @@ -11,5 +11,9 @@ RDEPEND=!sys-libs/libunwind RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://releases.llvm.org/9.0.0/libunwind-9.0.0.src.tar.xz test? ( https://releases.llvm.org/9.0.0/libcxx-9.0.0.src.tar.xz https://releases.llvm.org/9.0.0/libcxxabi-9.0.0.src.tar.xz ) +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=705ed592681fd22684bd57557a39ec9e diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0.9999 index eab35c892f8b..3eba6cb11b0a 100644 --- a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0.9999 +++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.0.9999 @@ -10,5 +10,9 @@ PROPERTIES=live RDEPEND=!sys-libs/libunwind RESTRICT=!test? ( test ) SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 llvm 5dbc14df2333105b7c006124ead9bf3f multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=e803b992e969e9b8dd84c0a45d12ad23 diff --git a/metadata/md5-cache/sys-libs/netbsd-csu-7.1 b/metadata/md5-cache/sys-libs/netbsd-csu-7.1 index d6113722555b..64ea29d0d130 100644 --- a/metadata/md5-cache/sys-libs/netbsd-csu-7.1 +++ b/metadata/md5-cache/sys-libs/netbsd-csu-7.1 @@ -9,5 +9,9 @@ LICENSE=BSD-2 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://dev.gentoo.org/~mgorny/dist/netbsd-csu-7.1.tar.xz test? ( https://dev.gentoo.org/~mgorny/dist/netbsd-csu-7.1-tests.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=36f799f49b9be715734f70db1a890a6d diff --git a/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta b/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta index b4a246b0bbce..39b1a140d5af 100644 --- a/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta +++ b/metadata/md5-cache/sys-libs/netbsd-csu-9.0_beta @@ -10,5 +10,9 @@ LICENSE=BSD-2 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://dev.gentoo.org/~mgorny/dist/netbsd-csu-9.0_beta.tar.xz test? ( https://dev.gentoo.org/~mgorny/dist/netbsd-csu-7.1-tests.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=bsdmk 9483ce8462177e1eca375e253e3bf7d5 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability 2b88d3ecc35035a3b8ab628b49cafb0e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=16bb5a72e4f024899c96a5256e5b512c diff --git a/metadata/md5-cache/sys-libs/timezone-data-2018i b/metadata/md5-cache/sys-libs/timezone-data-2018i index fce3d0681ac5..27a4c0cb3e68 100644 --- a/metadata/md5-cache/sys-libs/timezone-data-2018i +++ b/metadata/md5-cache/sys-libs/timezone-data-2018i @@ -9,5 +9,9 @@ LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2018i.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2018i.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=49d35a561426f86df6ae4b686523da8a diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019a b/metadata/md5-cache/sys-libs/timezone-data-2019a index 2346d02b3a18..6604185108ca 100644 --- a/metadata/md5-cache/sys-libs/timezone-data-2019a +++ b/metadata/md5-cache/sys-libs/timezone-data-2019a @@ -9,5 +9,9 @@ LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019a.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=9734c55c5ff74fb2c0bc49f443ec5361 diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019b-r1 b/metadata/md5-cache/sys-libs/timezone-data-2019b-r1 index 0b17f0bb22f0..26ecca3c9f2f 100644 --- a/metadata/md5-cache/sys-libs/timezone-data-2019b-r1 +++ b/metadata/md5-cache/sys-libs/timezone-data-2019b-r1 @@ -9,5 +9,9 @@ LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019b.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5349e97cbdab23d415a14752a399b995 diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 b/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 index ab9fe7bc7ede..b0a7fa2de7b8 100644 --- a/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 +++ b/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 @@ -9,5 +9,9 @@ LICENSE=BSD public-domain RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)] SLOT=0 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019b.tar.gz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=599cf455e9c2c0bfa0219aeed4e3402a diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26 index 034c58c9724b..81e6ed4baecf 100644 --- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26 +++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.26 @@ -9,5 +9,9 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv ) RESTRICT=strip test SLOT=0 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.26/uClibc-ng-1.0.26.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=b53926e41c5aac2fb241119310620421 diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 index ed99cf7f1c33..ce919e54e6e2 100644 --- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 +++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1 @@ -9,5 +9,9 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv ) RESTRICT=strip test SLOT=0 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.30/uClibc-ng-1.0.30.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=def56d58537f9e5834d073f4cfbe91ab diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31 index 2d7a7b75769e..d65bad4a219e 100644 --- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31 +++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31 @@ -9,5 +9,9 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv ) RESTRICT=strip test SLOT=0 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.31/uClibc-ng-1.0.31.tar.bz2 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=ea1be4db924289d542801bd010177298 diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999 index b9f8d3ab0259..4e365268cbcd 100644 --- a/metadata/md5-cache/sys-libs/uclibc-ng-9999 +++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999 @@ -9,5 +9,9 @@ PROPERTIES=live RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv ) RESTRICT=strip test SLOT=0 +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=97f73bb736099267381e3b954c2cbbc7 diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz Binary files differindex cabf560b8ab5..e4016a371d92 100644 --- a/metadata/md5-cache/sys-power/Manifest.gz +++ b/metadata/md5-cache/sys-power/Manifest.gz diff --git a/metadata/md5-cache/sys-power/iasl-20180810 b/metadata/md5-cache/sys-power/iasl-20180810 index 8363af3d8126..e8b1c95cbddb 100644 --- a/metadata/md5-cache/sys-power/iasl-20180810 +++ b/metadata/md5-cache/sys-power/iasl-20180810 @@ -8,5 +8,9 @@ KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd LICENSE=iASL SLOT=0 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20180810.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20180810.tar.gz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5f33adc69c48808b71b7595abd2d48d2 diff --git a/metadata/md5-cache/sys-power/iasl-20190215 b/metadata/md5-cache/sys-power/iasl-20190215 index 48fd02f8eb0a..9a99b34b21dd 100644 --- a/metadata/md5-cache/sys-power/iasl-20190215 +++ b/metadata/md5-cache/sys-power/iasl-20190215 @@ -8,5 +8,9 @@ KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd LICENSE=iASL SLOT=0 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20190215.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20190215.tar.gz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=dd6a813cd5368fb066cd0d930a4d1885 diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz Binary files differindex e74c0f71d42d..fe7a8da62a38 100644 --- a/metadata/md5-cache/sys-process/Manifest.gz +++ b/metadata/md5-cache/sys-process/Manifest.gz diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r7 b/metadata/md5-cache/sys-process/daemontools-0.76-r7 index 4981c1637dfe..61defa79c0c8 100644 --- a/metadata/md5-cache/sys-process/daemontools-0.76-r7 +++ b/metadata/md5-cache/sys-process/daemontools-0.76-r7 @@ -9,5 +9,9 @@ LICENSE=public-domain RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !app-doc/daemontools-man SLOT=0 SRC_URI=http://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=358142d8ebb82ba1d9ef001158e957ab diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.10 b/metadata/md5-cache/sys-process/daemontools-encore-1.10 index e5c8d82684e3..d04d60988c5f 100644 --- a/metadata/md5-cache/sys-process/daemontools-encore-1.10 +++ b/metadata/md5-cache/sys-process/daemontools-encore-1.10 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man SLOT=0 SRC_URI=http://untroubled.org/daemontools-encore/daemontools-encore-1.10.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=5b363e8e7d6c03c5ab94bbbeb91e5e74 diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.11 b/metadata/md5-cache/sys-process/daemontools-encore-1.11 index ca5bb776aa93..d3bb3fdf1caa 100644 --- a/metadata/md5-cache/sys-process/daemontools-encore-1.11 +++ b/metadata/md5-cache/sys-process/daemontools-encore-1.11 @@ -9,5 +9,9 @@ LICENSE=GPL-2 MIT RDEPEND=selinux? ( sec-policy/selinux-daemontools ) !sys-process/daemontools !app-doc/daemontools-man SLOT=0 SRC_URI=https://untroubled.org/daemontools-encore/daemontools-encore-1.11.tar.gz +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 qmail 3252a8b2ff27e590ef7f3b35fe907053 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=5b93c030ed9a6a56ecdb5ac413af0989 diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz Binary files differindex bfbd832eae69..00587b538aa6 100644 --- a/metadata/md5-cache/virtual/Manifest.gz +++ b/metadata/md5-cache/virtual/Manifest.gz diff --git a/metadata/md5-cache/virtual/libffi-3.3_rc0 b/metadata/md5-cache/virtual/libffi-3.3_rc0 index a0b8a4e0525b..ab32cd0a4a94 100644 --- a/metadata/md5-cache/virtual/libffi-3.3_rc0 +++ b/metadata/md5-cache/virtual/libffi-3.3_rc0 @@ -2,8 +2,16 @@ DEFINED_PHASES=- DESCRIPTION=A virtual for the Foreign Function Interface implementation EAPI=7 IUSE=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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +RDEPEND=>=dev-libs/libffi-3.3_rc0:0/7[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(-)?] +SLOT=0/7 +_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=be76373b4bd38b3b150c639d1e4ac0a1 +======= KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris RDEPEND=>=dev-libs/libffi-3.3_rc0:0/7[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(-)?] SLOT=0/7 _eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=f30873dd5669dc39adc3999b4c6ebaa2 +>>>>>>> next diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz Binary files differindex a396ce147607..24438b027226 100644 --- a/metadata/md5-cache/www-apache/Manifest.gz +++ b/metadata/md5-cache/www-apache/Manifest.gz diff --git a/metadata/md5-cache/www-apache/passenger-6.0.4 b/metadata/md5-cache/www-apache/passenger-6.0.4 index 823aa28a69ca..86fb27b745f7 100644 --- a/metadata/md5-cache/www-apache/passenger-6.0.4 +++ b/metadata/md5-cache/www-apache/passenger-6.0.4 @@ -10,5 +10,9 @@ RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=de REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) SLOT=0 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.4.tar.gz +<<<<<<< HEAD +_eclasses_=apache-module bd30ba4d834196e81cf2b76c52d26b93 depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=apache-module bd30ba4d834196e81cf2b76c52d26b93 depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f889b8d7960fe937399984c914c2ad0f diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz Binary files differindex 9d0aae09b81c..e4dc20e38460 100644 --- a/metadata/md5-cache/www-apps/Manifest.gz +++ b/metadata/md5-cache/www-apps/Manifest.gz diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz Binary files differindex 7f9c3ada4304..2a6ed9b5ffdc 100644 --- a/metadata/md5-cache/www-client/Manifest.gz +++ b/metadata/md5-cache/www-client/Manifest.gz diff --git a/metadata/md5-cache/www-client/chromium-77.0.3865.75 b/metadata/md5-cache/www-client/chromium-77.0.3865.75 new file mode 100644 index 000000000000..0da606c92607 --- /dev/null +++ b/metadata/md5-cache/www-client/chromium-77.0.3865.75 @@ -0,0 +1,16 @@ +BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig +DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup +DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) +DESCRIPTION=Open-source version of Google Chrome web browser +EAPI=7 +HOMEPAGE=http://chromium.org/ +IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW +KEYWORDS=amd64 ~arm64 ~x86 +LICENSE=BSD +RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) +REQUIRED_USE=component-build? ( !suid ) +RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) +SLOT=0 +SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.75.tar.xz +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 portability 2b88d3ecc35035a3b8ab628b49cafb0e python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=dcf8af0f40b96fae1c6419cd85673983 diff --git a/metadata/md5-cache/www-client/chromium-77.0.3865.90 b/metadata/md5-cache/www-client/chromium-77.0.3865.90 index 284cf3ed4a8f..85b752bc7251 100644 --- a/metadata/md5-cache/www-client/chromium-77.0.3865.90 +++ b/metadata/md5-cache/www-client/chromium-77.0.3865.90 @@ -5,12 +5,12 @@ DESCRIPTION=Open-source version of Google Chrome web browser EAPI=7 HOMEPAGE=http://chromium.org/ IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW -KEYWORDS=amd64 ~arm64 ~x86 +KEYWORDS=~amd64 ~arm64 ~x86 LICENSE=BSD RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) REQUIRED_USE=component-build? ( !suid ) RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) SLOT=0 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.90.tar.xz -_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 portability 2b88d3ecc35035a3b8ab628b49cafb0e python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=9f4c78f40b81de46665d5a96e53d6948 +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 portability 2b88d3ecc35035a3b8ab628b49cafb0e python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=ecdebfd5428c0fc2ac3133fef3a1c9dc diff --git a/metadata/md5-cache/www-client/chromium-78.0.3887.7 b/metadata/md5-cache/www-client/chromium-78.0.3887.7 index ad45170556da..0ea6965c1edd 100644 --- a/metadata/md5-cache/www-client/chromium-78.0.3887.7 +++ b/metadata/md5-cache/www-client/chromium-78.0.3887.7 @@ -12,5 +12,9 @@ REQUIRED_USE=component-build? ( !suid ) RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) SLOT=0 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-78.0.3887.7.tar.xz +<<<<<<< HEAD +_eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 portability 2b88d3ecc35035a3b8ab628b49cafb0e python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=check-reqs 5e40a693d9c828e8f3655184116e8b73 chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils db85a3c508cf82c45f24b2723791cc93 portability 2b88d3ecc35035a3b8ab628b49cafb0e python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=d7fd55570740a481cffc3f651cfb0738 diff --git a/metadata/md5-cache/www-client/falkon-3.1.0-r1 b/metadata/md5-cache/www-client/falkon-3.1.0-r1 index 0a5d0cf21573..c7123e9ac1fd 100644 --- a/metadata/md5-cache/www-client/falkon-3.1.0-r1 +++ b/metadata/md5-cache/www-client/falkon-3.1.0-r1 @@ -11,5 +11,9 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-q RESTRICT=test SLOT=0 SRC_URI=mirror://kde/stable/falkon/3.1/falkon-3.1.0.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=91fae358c0f6dbf766c03b54d32d785f diff --git a/metadata/md5-cache/www-client/firefox-60.8.0 b/metadata/md5-cache/www-client/firefox-60.8.0 index 8a33866cf56b..2f3e57c52abf 100644 --- a/metadata/md5-cache/www-client/firefox-60.8.0 +++ b/metadata/md5-cache/www-client/firefox-60.8.0 @@ -10,5 +10,9 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns RESTRICT=!bindist? ( bindist ) SLOT=0 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.8.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.8.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.8.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.8.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.8.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.8.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.8.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.8.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.8.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.8.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.8.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.8.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.8.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.8.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.8.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.8.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.8.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.8.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.8.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.8.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.8.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.8.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.8.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.8.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.8.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.8.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.8.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.8.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.8.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.8.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.8.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.8.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.8.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.8.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.8.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.8.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.8.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.8.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.8.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.8.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.8.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.8.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.8.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.8.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.8.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.8.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.8.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.8.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.8.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.8.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.8.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.8.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.8.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.8.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.8.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.8.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.8.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.8.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.8.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.8.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.8.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.8.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.8.0esr/source/firefox-60.8.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozconfig-v6.60 cae54fbd2c3ae7471ed679dda0f033f5 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozconfig-v6.60 cae54fbd2c3ae7471ed679dda0f033f5 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=72c61b1a7ff0598f6ee490a34366a725 diff --git a/metadata/md5-cache/www-client/firefox-60.9.0 b/metadata/md5-cache/www-client/firefox-60.9.0 index 6524d649201c..1dcc68df09dd 100644 --- a/metadata/md5-cache/www-client/firefox-60.9.0 +++ b/metadata/md5-cache/www-client/firefox-60.9.0 @@ -10,5 +10,9 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns RESTRICT=!bindist? ( bindist ) SLOT=0 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.9.0esr/source/firefox-60.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozconfig-v6.60 cae54fbd2c3ae7471ed679dda0f033f5 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozconfig-v6.60 cae54fbd2c3ae7471ed679dda0f033f5 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=37abdca30bd10f2ade8ec5befb40b3b7 diff --git a/metadata/md5-cache/www-client/firefox-68.1.0 b/metadata/md5-cache/www-client/firefox-68.1.0 index e6aed5067759..0c4c55b6aefe 100644 --- a/metadata/md5-cache/www-client/firefox-68.1.0 +++ b/metadata/md5-cache/www-client/firefox-68.1.0 @@ -11,5 +11,9 @@ REQUIRED_USE=wifi? ( dbus ) pgo? ( lto ) RESTRICT=!bindist? ( bindist ) SLOT=0 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ach.xpi -> firefox-68.1.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/af.xpi -> firefox-68.1.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/an.xpi -> firefox-68.1.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ar.xpi -> firefox-68.1.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ast.xpi -> firefox-68.1.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/az.xpi -> firefox-68.1.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/be.xpi -> firefox-68.1.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bg.xpi -> firefox-68.1.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bn.xpi -> firefox-68.1.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/br.xpi -> firefox-68.1.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bs.xpi -> firefox-68.1.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ca.xpi -> firefox-68.1.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cak.xpi -> firefox-68.1.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cs.xpi -> firefox-68.1.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cy.xpi -> firefox-68.1.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/da.xpi -> firefox-68.1.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/de.xpi -> firefox-68.1.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.1.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/el.xpi -> firefox-68.1.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.1.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.1.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/eo.xpi -> firefox-68.1.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.1.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.1.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.1.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.1.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/et.xpi -> firefox-68.1.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/eu.xpi -> firefox-68.1.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fa.xpi -> firefox-68.1.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ff.xpi -> firefox-68.1.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fi.xpi -> firefox-68.1.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fr.xpi -> firefox-68.1.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.1.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.1.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gd.xpi -> firefox-68.1.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gl.xpi -> firefox-68.1.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gn.xpi -> firefox-68.1.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.1.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/he.xpi -> firefox-68.1.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.1.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hr.xpi -> firefox-68.1.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.1.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hu.xpi -> firefox-68.1.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.1.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ia.xpi -> firefox-68.1.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/id.xpi -> firefox-68.1.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/is.xpi -> firefox-68.1.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/it.xpi -> firefox-68.1.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ja.xpi -> firefox-68.1.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ka.xpi -> firefox-68.1.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kab.xpi -> firefox-68.1.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kk.xpi -> firefox-68.1.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/km.xpi -> firefox-68.1.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kn.xpi -> firefox-68.1.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ko.xpi -> firefox-68.1.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lij.xpi -> firefox-68.1.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lt.xpi -> firefox-68.1.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lv.xpi -> firefox-68.1.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/mk.xpi -> firefox-68.1.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/mr.xpi -> firefox-68.1.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ms.xpi -> firefox-68.1.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/my.xpi -> firefox-68.1.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.1.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nl.xpi -> firefox-68.1.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.1.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/oc.xpi -> firefox-68.1.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.1.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pl.xpi -> firefox-68.1.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.1.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/rm.xpi -> firefox-68.1.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ro.xpi -> firefox-68.1.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ru.xpi -> firefox-68.1.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/si.xpi -> firefox-68.1.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sk.xpi -> firefox-68.1.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sl.xpi -> firefox-68.1.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/son.xpi -> firefox-68.1.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sq.xpi -> firefox-68.1.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sr.xpi -> firefox-68.1.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.1.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ta.xpi -> firefox-68.1.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/te.xpi -> firefox-68.1.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/th.xpi -> firefox-68.1.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/tr.xpi -> firefox-68.1.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/uk.xpi -> firefox-68.1.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ur.xpi -> firefox-68.1.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/uz.xpi -> firefox-68.1.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/vi.xpi -> firefox-68.1.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/xh.xpi -> firefox-68.1.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.1.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/source/firefox-68.1.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=77e70b383a39af17764b08128f5313ce diff --git a/metadata/md5-cache/www-client/firefox-69.0.1 b/metadata/md5-cache/www-client/firefox-69.0.1 index 6fd4ecfb2999..a9cabda1dc48 100644 --- a/metadata/md5-cache/www-client/firefox-69.0.1 +++ b/metadata/md5-cache/www-client/firefox-69.0.1 @@ -11,5 +11,9 @@ REQUIRED_USE=pgo? ( lto ) RESTRICT=!test? ( test ) SLOT=0 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ach.xpi -> firefox-69.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/af.xpi -> firefox-69.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/an.xpi -> firefox-69.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ar.xpi -> firefox-69.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ast.xpi -> firefox-69.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/az.xpi -> firefox-69.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/be.xpi -> firefox-69.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/bg.xpi -> firefox-69.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/bn.xpi -> firefox-69.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/br.xpi -> firefox-69.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/bs.xpi -> firefox-69.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ca.xpi -> firefox-69.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/cak.xpi -> firefox-69.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/cs.xpi -> firefox-69.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/cy.xpi -> firefox-69.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/da.xpi -> firefox-69.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/de.xpi -> firefox-69.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/dsb.xpi -> firefox-69.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/el.xpi -> firefox-69.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/en-CA.xpi -> firefox-69.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/en-GB.xpi -> firefox-69.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/eo.xpi -> firefox-69.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/es-AR.xpi -> firefox-69.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/es-CL.xpi -> firefox-69.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/es-ES.xpi -> firefox-69.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/es-MX.xpi -> firefox-69.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/et.xpi -> firefox-69.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/eu.xpi -> firefox-69.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/fa.xpi -> firefox-69.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ff.xpi -> firefox-69.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/fi.xpi -> firefox-69.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/fr.xpi -> firefox-69.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-69.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-69.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/gd.xpi -> firefox-69.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/gl.xpi -> firefox-69.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/gn.xpi -> firefox-69.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-69.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/he.xpi -> firefox-69.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-69.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/hr.xpi -> firefox-69.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/hsb.xpi -> firefox-69.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/hu.xpi -> firefox-69.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-69.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ia.xpi -> firefox-69.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/id.xpi -> firefox-69.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/is.xpi -> firefox-69.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/it.xpi -> firefox-69.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ja.xpi -> firefox-69.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ka.xpi -> firefox-69.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/kab.xpi -> firefox-69.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/kk.xpi -> firefox-69.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/km.xpi -> firefox-69.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/kn.xpi -> firefox-69.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ko.xpi -> firefox-69.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/lij.xpi -> firefox-69.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/lt.xpi -> firefox-69.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/lv.xpi -> firefox-69.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/mk.xpi -> firefox-69.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/mr.xpi -> firefox-69.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ms.xpi -> firefox-69.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/my.xpi -> firefox-69.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-69.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/nl.xpi -> firefox-69.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-69.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/oc.xpi -> firefox-69.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-69.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/pl.xpi -> firefox-69.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-69.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-69.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/rm.xpi -> firefox-69.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ro.xpi -> firefox-69.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ru.xpi -> firefox-69.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/si.xpi -> firefox-69.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/sk.xpi -> firefox-69.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/sl.xpi -> firefox-69.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/son.xpi -> firefox-69.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/sq.xpi -> firefox-69.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/sr.xpi -> firefox-69.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-69.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ta.xpi -> firefox-69.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/te.xpi -> firefox-69.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/th.xpi -> firefox-69.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/tr.xpi -> firefox-69.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/uk.xpi -> firefox-69.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/ur.xpi -> firefox-69.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/uz.xpi -> firefox-69.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/vi.xpi -> firefox-69.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/xh.xpi -> firefox-69.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-69.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/69.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-69.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/69.0.1/source/firefox-69.0.1.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-69.0-patches-06.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 llvm 5dbc14df2333105b7c006124ead9bf3f ltprune 2729691420b6deeda2a90b1f1183fb55 mozcoreconf-v6 421fbfb443b64f7f1e2e3dd5bb739541 mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 53625127887b62eabb9ec61d3d943462 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=bb06c57c0625ee488d71fc00c183aea6 diff --git a/metadata/md5-cache/www-client/google-chrome-beta-78.0.3904.21 b/metadata/md5-cache/www-client/google-chrome-beta-78.0.3904.21 new file mode 100644 index 000000000000..bfc8c357c55e --- /dev/null +++ b/metadata/md5-cache/www-client/google-chrome-beta-78.0.3904.21 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack +DESCRIPTION=The web browser from Google +EAPI=6 +HOMEPAGE=https://www.google.com/chrome +IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW +KEYWORDS=-* ~amd64 +LICENSE=google-chrome +RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils +RESTRICT=bindist mirror strip +SLOT=0 +SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_78.0.3904.21-1_amd64.deb +_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=41d165a2c0d07dba94ea75edcaf796a1 diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3904.17 b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3904.17 new file mode 100644 index 000000000000..e7abb1c2aa75 --- /dev/null +++ b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3904.17 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack +DESCRIPTION=The web browser from Google +EAPI=6 +HOMEPAGE=https://www.google.com/chrome +IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW +KEYWORDS=-* ~amd64 +LICENSE=google-chrome +RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils +RESTRICT=bindist mirror strip +SLOT=0 +SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3904.17-1_amd64.deb +_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=41d165a2c0d07dba94ea75edcaf796a1 diff --git a/metadata/md5-cache/www-client/opera-developer-65.0.3445.0 b/metadata/md5-cache/www-client/opera-developer-65.0.3445.0 new file mode 100644 index 000000000000..9e8f2e9584f2 --- /dev/null +++ b/metadata/md5-cache/www-client/opera-developer-65.0.3445.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm prepare setup unpack +DESCRIPTION=A fast and secure web browser +EAPI=7 +HOMEPAGE=https://www.opera.com/ +IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW +KEYWORDS=~amd64 +LICENSE=OPERA-2014 +RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X] +SLOT=0 +SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/65.0.3445.0/linux/opera-developer_65.0.3445.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/65.0.3445.0/linux/opera-developer_65.0.3445.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/65.0.3445.0/linux/opera-developer_65.0.3445.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/65.0.3445.0/linux/opera-developer_65.0.3445.0_amd64.deb ) +_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=15a3756fba642990d5e49f40be495e5e diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5 b/metadata/md5-cache/www-client/seamonkey-2.49.5 index 2adca73fa36a..9dabb7f60029 100644 --- a/metadata/md5-cache/www-client/seamonkey-2.49.5 +++ b/metadata/md5-cache/www-client/seamonkey-2.49.5 @@ -9,5 +9,9 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla ) SLOT=0 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source.tar.xz -> seamonkey-2.49.5.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source-l10n.tar.xz -> seamonkey-2.49.5.source-l10n.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mozconfig-v6.52 43edd59f1e8e1f9536f3c0d3703ece9d mozcoreconf-v5 602c3c0a642bafeabb149c49a6df941f mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e nsplugins 2049586e425364a1c5bdb004205d1758 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 check-reqs 5e40a693d9c828e8f3655184116e8b73 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mozconfig-v6.52 43edd59f1e8e1f9536f3c0d3703ece9d mozcoreconf-v5 602c3c0a642bafeabb149c49a6df941f mozextension f47f008a138943f9e40e37c1fca10b24 mozlinguas-v2 7559b4e56a88d67da4e96e77296f723c multilib 1d91b03d42ab6308b5f4f6b598ed110e nsplugins 2049586e425364a1c5bdb004205d1758 pax-utils db85a3c508cf82c45f24b2723791cc93 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=c7e2b1531992b7994d0e4ba9d18bfea9 diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz Binary files differindex 663111dca679..91fd6f99f59a 100644 --- a/metadata/md5-cache/www-misc/Manifest.gz +++ b/metadata/md5-cache/www-misc/Manifest.gz diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz Binary files differindex 1eff0dd44125..ef6640124ed4 100644 --- a/metadata/md5-cache/www-plugins/Manifest.gz +++ b/metadata/md5-cache/www-plugins/Manifest.gz diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3904.17_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3904.17_alpha new file mode 100644 index 000000000000..9048bc87120c --- /dev/null +++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3904.17_alpha @@ -0,0 +1,12 @@ +DEFINED_PHASES=install nofetch unpack +DESCRIPTION=Binary plugins from Google Chrome for use in Chromium +EAPI=6 +HOMEPAGE=https://www.google.com/chrome +KEYWORDS=-* ~amd64 +LICENSE=google-chrome +RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable +RESTRICT=bindist mirror strip +SLOT=unstable +SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3904.17-1_amd64.deb +_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 +_md5_=c25eb544ca56bb9febe989416ab0f941 diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3904.21_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3904.21_beta new file mode 100644 index 000000000000..52a9fd0b18d0 --- /dev/null +++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3904.21_beta @@ -0,0 +1,12 @@ +DEFINED_PHASES=install nofetch unpack +DESCRIPTION=Binary plugins from Google Chrome for use in Chromium +EAPI=6 +HOMEPAGE=https://www.google.com/chrome +KEYWORDS=-* ~amd64 +LICENSE=google-chrome +RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable +RESTRICT=bindist mirror strip +SLOT=beta +SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_78.0.3904.21-1_amd64.deb +_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a unpacker 3cd8bad0d31e525cd26be1bfa4e61631 +_md5_=c25eb544ca56bb9febe989416ab0f941 diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz Binary files differindex b867b62bf7d6..90276f6b5c81 100644 --- a/metadata/md5-cache/www-servers/Manifest.gz +++ b/metadata/md5-cache/www-servers/Manifest.gz diff --git a/metadata/md5-cache/www-servers/nginx-1.17.4 b/metadata/md5-cache/www-servers/nginx-1.17.4 index da9b2ce4a63e..c1cadae6b949 100644 --- a/metadata/md5-cache/www-servers/nginx-1.17.4 +++ b/metadata/md5-cache/www-servers/nginx-1.17.4 @@ -12,5 +12,9 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules RESTRICT=test SLOT=mainline SRC_URI=https://nginx.org/download/nginx-1.17.4.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.5.tar.gz -> njs-0.3.5.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.5.tar.gz -> njs-0.3.5.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils db85a3c508cf82c45f24b2723791cc93 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 20c90ae7e826995a597683580cdfcdcb preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=0cf609d95f5f9154c6b4859fc45ac1a2 diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1 b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1 index dc44ca657f2d..15ab1b676635 100644 --- a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1 +++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1 @@ -10,5 +10,9 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_asyncio? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) ) SLOT=0 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.17.1.tar.gz -> uwsgi-2.0.17.1.tar.gz +<<<<<<< HEAD +_eclasses_=apache-module bd30ba4d834196e81cf2b76c52d26b93 autotools 1bf086cdd7356f5c9a4acd9727bd2065 depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=apache-module bd30ba4d834196e81cf2b76c52d26b93 autotools 1bf086cdd7356f5c9a4acd9727bd2065 depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=c07217c64c497293ca801e7e3c5a68f8 diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1 index cd9636eb94ba..8d009dc5f54d 100644 --- a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1 +++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1 @@ -10,5 +10,9 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_asyncio? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) ) SLOT=0 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.17.1.tar.gz -> uwsgi-2.0.17.1.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=f04971a11faa2ebca2660559aa3a4842 diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.18 b/metadata/md5-cache/www-servers/uwsgi-2.0.18 index df0ae72f3630..bc49cf21274a 100644 --- a/metadata/md5-cache/www-servers/uwsgi-2.0.18 +++ b/metadata/md5-cache/www-servers/uwsgi-2.0.18 @@ -10,5 +10,9 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_asyncio? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) ) SLOT=0 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.18.tar.gz -> uwsgi-2.0.18.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils db85a3c508cf82c45f24b2723791cc93 php-ext-source-r3 dd53cd94748f9e498bea0f9480ba8d77 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-ng a28f4a400304e633468f10ad1b9e2f6e ruby-utils 5b782a86f95c84466cdb53f8c8a8be37 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=e1d7f2c998c75f90260ab791a91114d4 diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz Binary files differindex e75e9b594dc0..34214b654c1e 100644 --- a/metadata/md5-cache/x11-apps/Manifest.gz +++ b/metadata/md5-cache/x11-apps/Manifest.gz diff --git a/metadata/md5-cache/x11-apps/appres-1.0.4 b/metadata/md5-cache/x11-apps/appres-1.0.4 index 9f43617e159c..f7e542982be4 100644 --- a/metadata/md5-cache/x11-apps/appres-1.0.4 +++ b/metadata/md5-cache/x11-apps/appres-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e9349187986d3daba6351718229f6c41 diff --git a/metadata/md5-cache/x11-apps/appres-1.0.5 b/metadata/md5-cache/x11-apps/appres-1.0.5 index ee160dbb29bb..3bc18d6cb418 100644 --- a/metadata/md5-cache/x11-apps/appres-1.0.5 +++ b/metadata/md5-cache/x11-apps/appres-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=dddeb6f07fd877687b4dde9c064db2b0 diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.1 b/metadata/md5-cache/x11-apps/bdftopcf-1.1 index 2cae0fe1ef9a..a0f71e27457e 100644 --- a/metadata/md5-cache/x11-apps/bdftopcf-1.1 +++ b/metadata/md5-cache/x11-apps/bdftopcf-1.1 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e1fb179276dcbc0bd798a828265cce14 diff --git a/metadata/md5-cache/x11-apps/beforelight-1.0.5 b/metadata/md5-cache/x11-apps/beforelight-1.0.5 index 886fd68d77f8..4586b25a77d3 100644 --- a/metadata/md5-cache/x11-apps/beforelight-1.0.5 +++ b/metadata/md5-cache/x11-apps/beforelight-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/beforelight-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=7d9a2db50352f885d4fea6231f43df60 diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.9 b/metadata/md5-cache/x11-apps/bitmap-1.0.9 index e1b682d5a703..ff28c9627bc5 100644 --- a/metadata/md5-cache/x11-apps/bitmap-1.0.9 +++ b/metadata/md5-cache/x11-apps/bitmap-1.0.9 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/bitmap-1.0.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=b59ce1e203f7478c52c17a682abd764e diff --git a/metadata/md5-cache/x11-apps/editres-1.0.6 b/metadata/md5-cache/x11-apps/editres-1.0.6 index 1c72f44619aa..5780addaf00f 100644 --- a/metadata/md5-cache/x11-apps/editres-1.0.6 +++ b/metadata/md5-cache/x11-apps/editres-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=50c982d8ce9c93c598017614cd043428 diff --git a/metadata/md5-cache/x11-apps/editres-1.0.7 b/metadata/md5-cache/x11-apps/editres-1.0.7 index d8dd2c7387f8..3823b7dbfc98 100644 --- a/metadata/md5-cache/x11-apps/editres-1.0.7 +++ b/metadata/md5-cache/x11-apps/editres-1.0.7 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.7.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=750ef33801582319df9581d6f9db5fdd diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.5 b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.5 index abdb6474880b..87b6833eb8bf 100644 --- a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.5 +++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/fonttosfnt-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=50da5c1fc4248c17167bb2e7b0d8104a diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1 index 7656ff2efded..3421f80f6376 100644 --- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1 +++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libFS SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/fslsfonts-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=789d13735c49ff5b085d8f1c572037ca diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.6 b/metadata/md5-cache/x11-apps/fstobdf-1.0.6 index b6abb0a929c6..b6892026fe8b 100644 --- a/metadata/md5-cache/x11-apps/fstobdf-1.0.6 +++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libFS SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/fstobdf-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=9958d62aabcf51df50b300fd1271a4c3 diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.8 b/metadata/md5-cache/x11-apps/iceauth-1.0.8 index a653686b0cd5..f8e58f71c516 100644 --- a/metadata/md5-cache/x11-apps/iceauth-1.0.8 +++ b/metadata/md5-cache/x11-apps/iceauth-1.0.8 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libICE SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/iceauth-1.0.8.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=2d878cfba20eb3f00d6682daa533fb83 diff --git a/metadata/md5-cache/x11-apps/ico-1.0.4 b/metadata/md5-cache/x11-apps/ico-1.0.4 index d0d977db53b0..74d566e93e75 100644 --- a/metadata/md5-cache/x11-apps/ico-1.0.4 +++ b/metadata/md5-cache/x11-apps/ico-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e4ab992f58e5584c6b8f7929d564c089 diff --git a/metadata/md5-cache/x11-apps/ico-1.0.5 b/metadata/md5-cache/x11-apps/ico-1.0.5 index 9c4f62cd8565..784e6ac70f01 100644 --- a/metadata/md5-cache/x11-apps/ico-1.0.5 +++ b/metadata/md5-cache/x11-apps/ico-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e840bfe3b00ebec5fa5b82ff85e34543 diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.4 b/metadata/md5-cache/x11-apps/oclock-1.0.4 index 7ce84497022b..4562c0ff738b 100644 --- a/metadata/md5-cache/x11-apps/oclock-1.0.4 +++ b/metadata/md5-cache/x11-apps/oclock-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/oclock-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=747a028a50839ece5834dfe17d745bc7 diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.5 b/metadata/md5-cache/x11-apps/rgb-1.0.5 index 5aeb0a97acca..bb96121243fe 100644 --- a/metadata/md5-cache/x11-apps/rgb-1.0.5 +++ b/metadata/md5-cache/x11-apps/rgb-1.0.5 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/rgb-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=00214695aab7ab58bbdc89a56f8bd865 diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.6 b/metadata/md5-cache/x11-apps/rgb-1.0.6 index e3b6acd3f579..48cc8526b9b8 100644 --- a/metadata/md5-cache/x11-apps/rgb-1.0.6 +++ b/metadata/md5-cache/x11-apps/rgb-1.0.6 @@ -7,5 +7,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/rgb-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=78e2fcefc6dbd2c438d6de582b63b380 diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.5-r1 b/metadata/md5-cache/x11-apps/rstart-1.0.5-r1 index ce7514ac3dbd..29b15dee0b0d 100644 --- a/metadata/md5-cache/x11-apps/rstart-1.0.5-r1 +++ b/metadata/md5-cache/x11-apps/rstart-1.0.5-r1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/rstart-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=17253b71693d7f9dcd92255e97d50486 diff --git a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 index 87e4d812da24..4b779ee70efb 100644 --- a/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 +++ b/metadata/md5-cache/x11-apps/scripts-1.0.1-r1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/scripts-1.0.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=b69614b03a58625f2b13adba7622453e diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 index d1b6c8889816..1eed13fbc0ae 100644 --- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 +++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-misc/xkeyboard-config SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=7febd6c2fa56799220eb4b689b1d19d4 diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.4 b/metadata/md5-cache/x11-apps/showfont-1.0.4 index 8cd6dc304809..d32d05b1a14f 100644 --- a/metadata/md5-cache/x11-apps/showfont-1.0.4 +++ b/metadata/md5-cache/x11-apps/showfont-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libFS SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=27e791026a6ed44d7d47db8a2e341165 diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.5 b/metadata/md5-cache/x11-apps/showfont-1.0.5 index 8332eac57fd5..ffa9e6dc14f2 100644 --- a/metadata/md5-cache/x11-apps/showfont-1.0.5 +++ b/metadata/md5-cache/x11-apps/showfont-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libFS SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=6cb45a94f7b199e10087f724d86255dd diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.6 b/metadata/md5-cache/x11-apps/smproxy-1.0.6 index aea9854457df..095419ab2ec6 100644 --- a/metadata/md5-cache/x11-apps/smproxy-1.0.6 +++ b/metadata/md5-cache/x11-apps/smproxy-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXt x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/smproxy-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ce7077ac48a932bd13040dd60686015b diff --git a/metadata/md5-cache/x11-apps/transset-1.0.1 b/metadata/md5-cache/x11-apps/transset-1.0.1 index 3462aa916f55..7fe9183b20d1 100644 --- a/metadata/md5-cache/x11-apps/transset-1.0.1 +++ b/metadata/md5-cache/x11-apps/transset-1.0.1 @@ -8,5 +8,9 @@ LICENSE=SGI-B-2.0 RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/transset-1.0.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=78c469bf2cd7257e6c6aba366ef2ac11 diff --git a/metadata/md5-cache/x11-apps/transset-1.0.2 b/metadata/md5-cache/x11-apps/transset-1.0.2 index cdb458bfadf2..915412b23f51 100644 --- a/metadata/md5-cache/x11-apps/transset-1.0.2 +++ b/metadata/md5-cache/x11-apps/transset-1.0.2 @@ -8,5 +8,9 @@ LICENSE=SGI-B-2.0 RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/transset-1.0.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=78c469bf2cd7257e6c6aba366ef2ac11 diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.6 b/metadata/md5-cache/x11-apps/viewres-1.0.6 index 339f80519b6b..0380761c785d 100644 --- a/metadata/md5-cache/x11-apps/viewres-1.0.6 +++ b/metadata/md5-cache/x11-apps/viewres-1.0.6 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/viewres-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=6f8c61a881855db4c352624c1d5ae0d2 diff --git a/metadata/md5-cache/x11-apps/xauth-1.1 b/metadata/md5-cache/x11-apps/xauth-1.1 index a493a1682752..522e4d3b3cd2 100644 --- a/metadata/md5-cache/x11-apps/xauth-1.1 +++ b/metadata/md5-cache/x11-apps/xauth-1.1 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xauth-1.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=0e9dbd99858791eac735559755d54727 diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.2.3 b/metadata/md5-cache/x11-apps/xbacklight-1.2.3 index 35ac59d693f6..4ef265b4485a 100644 --- a/metadata/md5-cache/x11-apps/xbacklight-1.2.3 +++ b/metadata/md5-cache/x11-apps/xbacklight-1.2.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xbacklight-1.2.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=f728448d9812943d17c2d9b3862e478d diff --git a/metadata/md5-cache/x11-apps/xbiff-1.0.4 b/metadata/md5-cache/x11-apps/xbiff-1.0.4 index d586a8aad51e..30fda38aebc6 100644 --- a/metadata/md5-cache/x11-apps/xbiff-1.0.4 +++ b/metadata/md5-cache/x11-apps/xbiff-1.0.4 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xbiff-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=92c7220227533ef669e18880d23d909f diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.3 b/metadata/md5-cache/x11-apps/xclipboard-1.1.3 index f937a147f426..ae99800cda19 100644 --- a/metadata/md5-cache/x11-apps/xclipboard-1.1.3 +++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xclipboard-1.1.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=28e32cdf10d15610233712a9d29f2e16 diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.9 b/metadata/md5-cache/x11-apps/xclock-1.0.9 index ea68d02ecc83..05716afcbf52 100644 --- a/metadata/md5-cache/x11-apps/xclock-1.0.9 +++ b/metadata/md5-cache/x11-apps/xclock-1.0.9 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xclock-1.0.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=8fb4f1014c2485f9cb1c290b700a869a diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.5 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.5 index bf13422ed91e..1c408057e24f 100644 --- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.5 +++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xcmsdb-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=c7ca4fc8244645387aeaf854cd8f1808 diff --git a/metadata/md5-cache/x11-apps/xconsole-1.0.7 b/metadata/md5-cache/x11-apps/xconsole-1.0.7 index 351f84569388..71c681a6fc6a 100644 --- a/metadata/md5-cache/x11-apps/xconsole-1.0.7 +++ b/metadata/md5-cache/x11-apps/xconsole-1.0.7 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xconsole-1.0.7.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=1ea3b3c74f8e79a68bfb1935dc81ec3d diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.7 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7 index c8d54723e129..aca6139312bc 100644 --- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.7 +++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0= SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xcursorgen-1.0.7.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=a5915f298fd728ef8108719ea6601742 diff --git a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 index a17289c9c5ee..020c8918dae3 100644 --- a/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 +++ b/metadata/md5-cache/x11-apps/xdbedizzy-1.1.0 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXext x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xdbedizzy-1.1.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=170efa9359fd619ff4b6d30bc6a696e8 diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1 index 1a7674e1ebbc..2592f83a2d20 100644 --- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1 +++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=aa028dbea549b461523cee18995e6e09 diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2 index 6b98d0f6d60a..4c44020d8eee 100644 --- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2 +++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=aa028dbea549b461523cee18995e6e09 diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.5 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.5 index 90ea24f51138..2fceadea2ef3 100644 --- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.5 +++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 virtual/opengl SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xdriinfo-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e7b6ad54decf16faec932b62bae35f67 diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.6 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.6 index 7f3f7fbc40c1..89cf842284c3 100644 --- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.6 +++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 virtual/opengl SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xdriinfo-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=0ec0a0875de7c25da65733751c029abd diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.1 b/metadata/md5-cache/x11-apps/xedit-1.2.1 index 16c0aa8ce29c..0a8283f90afe 100644 --- a/metadata/md5-cache/x11-apps/xedit-1.2.1 +++ b/metadata/md5-cache/x11-apps/xedit-1.2.1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5214dd8499426785248890bbee504fd7 diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.2 b/metadata/md5-cache/x11-apps/xedit-1.2.2 index 90410fcff97f..4b2f5d477162 100644 --- a/metadata/md5-cache/x11-apps/xedit-1.2.2 +++ b/metadata/md5-cache/x11-apps/xedit-1.2.2 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=55253d14e33a07816b82251770c0f5d6 diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.1 b/metadata/md5-cache/x11-apps/xeyes-1.1.1 index b3271c8cc0f7..92be90e4ff96 100644 --- a/metadata/md5-cache/x11-apps/xeyes-1.1.1 +++ b/metadata/md5-cache/x11-apps/xeyes-1.1.1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.1.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=15182e2fc3190ad6a6548e1c88168322 diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.2 b/metadata/md5-cache/x11-apps/xeyes-1.1.2 index 4468dc02e3d4..598e14f6af70 100644 --- a/metadata/md5-cache/x11-apps/xeyes-1.1.2 +++ b/metadata/md5-cache/x11-apps/xeyes-1.1.2 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.1.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5d5dc0d8464c728b9460e74260ebadf3 diff --git a/metadata/md5-cache/x11-apps/xf86dga-1.0.3 b/metadata/md5-cache/x11-apps/xf86dga-1.0.3 index f6dd819f1ac7..7ca9549718ca 100644 --- a/metadata/md5-cache/x11-apps/xf86dga-1.0.3 +++ b/metadata/md5-cache/x11-apps/xf86dga-1.0.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xf86dga-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=6f20cd0af3171782838b06a24efee509 diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.5 b/metadata/md5-cache/x11-apps/xfontsel-1.0.5 index 79046c311626..38e75ec9873e 100644 --- a/metadata/md5-cache/x11-apps/xfontsel-1.0.5 +++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=9386a61cddb6f61912488507ad738325 diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.6 b/metadata/md5-cache/x11-apps/xfontsel-1.0.6 index d41b6efe8ee6..39f81e4a3015 100644 --- a/metadata/md5-cache/x11-apps/xfontsel-1.0.6 +++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=a1181affebe1ab483512f972cd6e168f diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.6 b/metadata/md5-cache/x11-apps/xgamma-1.0.6 index dbc11c2d2e7c..865e46e53c86 100644 --- a/metadata/md5-cache/x11-apps/xgamma-1.0.6 +++ b/metadata/md5-cache/x11-apps/xgamma-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXxf86vm x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xgamma-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ed5ccb2834917b72c4bfe7d6b4e45a9f diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.4 b/metadata/md5-cache/x11-apps/xgc-1.0.4 index 3776424755ef..b787b39213e8 100644 --- a/metadata/md5-cache/x11-apps/xgc-1.0.4 +++ b/metadata/md5-cache/x11-apps/xgc-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=fa67280c1922752dbf5c3972b328ea76 diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.5 b/metadata/md5-cache/x11-apps/xgc-1.0.5 index d3676ac9e08b..bc44600c2d03 100644 --- a/metadata/md5-cache/x11-apps/xgc-1.0.5 +++ b/metadata/md5-cache/x11-apps/xgc-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5ea3a8effb825d5ce2eb10f882e0f5c1 diff --git a/metadata/md5-cache/x11-apps/xinput-1.6.3 b/metadata/md5-cache/x11-apps/xinput-1.6.3 index 87e9e0e5fb12..a08a62d2f34a 100644 --- a/metadata/md5-cache/x11-apps/xinput-1.6.3 +++ b/metadata/md5-cache/x11-apps/xinput-1.6.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama x11-libs/libXrandr SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xinput-1.6.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=dfc3d8771a1f8cd56757c5b62224d3c7 diff --git a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1 b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1 index 6775796d62a6..eb9621d456df 100644 --- a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1 +++ b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr gtk? ( dev-cpp/gtkmm:2.4 ) SLOT=0 SRC_URI=https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=e9fbea6781bec87485556a2e2ddc01fb diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.4.2 b/metadata/md5-cache/x11-apps/xkbcomp-1.4.2 index 7cf2f9b6a319..92d8d6b4c265 100644 --- a/metadata/md5-cache/x11-apps/xkbcomp-1.4.2 +++ b/metadata/md5-cache/x11-apps/xkbcomp-1.4.2 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libxkbfile SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.4.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=0a98e66ac3c0720dd81e39fe51632e97 diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.4 b/metadata/md5-cache/x11-apps/xkbevd-1.1.4 index ae63a7222328..c7ad56332be9 100644 --- a/metadata/md5-cache/x11-apps/xkbevd-1.1.4 +++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libxkbfile SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xkbevd-1.1.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=85acf5ed89e7689f08b9e6a847efa0d8 diff --git a/metadata/md5-cache/x11-apps/xkbprint-1.0.4 b/metadata/md5-cache/x11-apps/xkbprint-1.0.4 index a7d6748cd46d..7bd8ce43b1f9 100644 --- a/metadata/md5-cache/x11-apps/xkbprint-1.0.4 +++ b/metadata/md5-cache/x11-apps/xkbprint-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libxkbfile x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xkbprint-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=cb307085fe11abab8949dd0add2399cc diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.4 b/metadata/md5-cache/x11-apps/xkbutils-1.0.4 index 236ad05bef20..846c643fa3b8 100644 --- a/metadata/md5-cache/x11-apps/xkbutils-1.0.4 +++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xkbutils-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=53547f085f8b8d132b98350ceb42e439 diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.4 b/metadata/md5-cache/x11-apps/xkill-1.0.4 index f485bcbd5b6c..315fd296992a 100644 --- a/metadata/md5-cache/x11-apps/xkill-1.0.4 +++ b/metadata/md5-cache/x11-apps/xkill-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xkill-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=b71ba2c2082afb927612e31376277a51 diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.5 b/metadata/md5-cache/x11-apps/xkill-1.0.5 index 3204fb79bd00..5c2f75e0bb19 100644 --- a/metadata/md5-cache/x11-apps/xkill-1.0.5 +++ b/metadata/md5-cache/x11-apps/xkill-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xkill-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=cb6ca336852c8bef59f220cb6bacc6b7 diff --git a/metadata/md5-cache/x11-apps/xload-1.1.2 b/metadata/md5-cache/x11-apps/xload-1.1.2 index 11c1e571b9bf..5a9049cf8cbe 100644 --- a/metadata/md5-cache/x11-apps/xload-1.1.2 +++ b/metadata/md5-cache/x11-apps/xload-1.1.2 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=dc4753d93b5d809711e5bca9f1b616a3 diff --git a/metadata/md5-cache/x11-apps/xload-1.1.3 b/metadata/md5-cache/x11-apps/xload-1.1.3 index e4c64d4ea599..8e2c517cff9e 100644 --- a/metadata/md5-cache/x11-apps/xload-1.1.3 +++ b/metadata/md5-cache/x11-apps/xload-1.1.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=c40f906eed9def09ab92b30fbe188106 diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.4 b/metadata/md5-cache/x11-apps/xlsclients-1.1.4 index bc2e6bea750e..f6c2af0a29db 100644 --- a/metadata/md5-cache/x11-apps/xlsclients-1.1.4 +++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xlsclients-1.1.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=37edff3146d0cf81a5c1c01139ee4e94 diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.6 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.6 index bf4c454bf4d2..f961ff224b25 100644 --- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.6 +++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xlsfonts-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=8da1dfd05f09e6bfc1f3b49e8a4a6b0c diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.6 b/metadata/md5-cache/x11-apps/xmag-1.0.6 index bad4f846a61e..ad1c20eb0567 100644 --- a/metadata/md5-cache/x11-apps/xmag-1.0.6 +++ b/metadata/md5-cache/x11-apps/xmag-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xmag-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d4c8b1dc428194cd050df4520bd8aceb diff --git a/metadata/md5-cache/x11-apps/xman-1.1.5 b/metadata/md5-cache/x11-apps/xman-1.1.5 index 31c9df47fa70..57910dd718cb 100644 --- a/metadata/md5-cache/x11-apps/xman-1.1.5 +++ b/metadata/md5-cache/x11-apps/xman-1.1.5 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xman-1.1.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=81ae23713cafb5733d8e725d0d22a5bf diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.4 b/metadata/md5-cache/x11-apps/xmessage-1.0.4 index 3d0a76c6ac28..e8882495dbb0 100644 --- a/metadata/md5-cache/x11-apps/xmessage-1.0.4 +++ b/metadata/md5-cache/x11-apps/xmessage-1.0.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=9f274bb2bf9976522006fa9e2f8f5c6d diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.5 b/metadata/md5-cache/x11-apps/xmessage-1.0.5 index 720d0462fe51..fb8e285344b0 100644 --- a/metadata/md5-cache/x11-apps/xmessage-1.0.5 +++ b/metadata/md5-cache/x11-apps/xmessage-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXt SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5c8d5295e6be28381d3683804ae89830 diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.5 b/metadata/md5-cache/x11-apps/xpr-1.0.5 index 6c74dc7509b3..b091f2525373 100644 --- a/metadata/md5-cache/x11-apps/xpr-1.0.5 +++ b/metadata/md5-cache/x11-apps/xpr-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXmu x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xpr-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5b18d0248f42e264f01403bc79a2f7d6 diff --git a/metadata/md5-cache/x11-apps/xrandr-1.5.1 b/metadata/md5-cache/x11-apps/xrandr-1.5.1 index 3f02a9981edf..87b39a2b17f3 100644 --- a/metadata/md5-cache/x11-apps/xrandr-1.5.1 +++ b/metadata/md5-cache/x11-apps/xrandr-1.5.1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xrandr-1.5.1.tar.xz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=5ba143963051162295b548ac3373c2d7 diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.5 b/metadata/md5-cache/x11-apps/xrefresh-1.0.5 index f40d9f938a7a..251db1da3db2 100644 --- a/metadata/md5-cache/x11-apps/xrefresh-1.0.5 +++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e6827f9400cf3ec547cfc49477df73fb diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.6 b/metadata/md5-cache/x11-apps/xrefresh-1.0.6 index 1871739b9230..a64ec2580f88 100644 --- a/metadata/md5-cache/x11-apps/xrefresh-1.0.6 +++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=7b6943e4ffeadea622ff7971aadcd8f2 diff --git a/metadata/md5-cache/x11-apps/xset-1.2.3 b/metadata/md5-cache/x11-apps/xset-1.2.3 index 3e376bfabe6d..90fd3c076492 100644 --- a/metadata/md5-cache/x11-apps/xset-1.2.3 +++ b/metadata/md5-cache/x11-apps/xset-1.2.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xset-1.2.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d5f41abc639872e5e077c7d2db8f2dcf diff --git a/metadata/md5-cache/x11-apps/xset-1.2.4 b/metadata/md5-cache/x11-apps/xset-1.2.4 index 600ab5216d57..492390f058e9 100644 --- a/metadata/md5-cache/x11-apps/xset-1.2.4 +++ b/metadata/md5-cache/x11-apps/xset-1.2.4 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xset-1.2.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=f1daca84f385fa90504d872faadd7ccf diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.1 index a0fe10b4a56e..3566197c960e 100644 --- a/metadata/md5-cache/x11-apps/xsetroot-1.1.1 +++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=41c12d173f6714439ad1865d10f34307 diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.2 b/metadata/md5-cache/x11-apps/xsetroot-1.1.2 index 0901a31b195f..d74d14bd2b53 100644 --- a/metadata/md5-cache/x11-apps/xsetroot-1.1.2 +++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.2 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=465265a882ff559998f643be33392c49 diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.3 b/metadata/md5-cache/x11-apps/xsm-1.0.3 index e95080dca4be..2f4d54b30c54 100644 --- a/metadata/md5-cache/x11-apps/xsm-1.0.3 +++ b/metadata/md5-cache/x11-apps/xsm-1.0.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xsm-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=c815dbf492a8043feb4aee65d68ee66e diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.4 b/metadata/md5-cache/x11-apps/xsm-1.0.4 index 2dcae2c0d7dc..137e3cb7dd6c 100644 --- a/metadata/md5-cache/x11-apps/xsm-1.0.4 +++ b/metadata/md5-cache/x11-apps/xsm-1.0.4 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xsm-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d07e6eff5d1cc1c72ba453e2a4c78121 diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.3 b/metadata/md5-cache/x11-apps/xvidtune-1.0.3 index 6625d178e0cd..7ea89db49020 100644 --- a/metadata/md5-cache/x11-apps/xvidtune-1.0.3 +++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xvidtune-1.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=026fb348ac3250198f3cdfeffb061cd9 diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.6 b/metadata/md5-cache/x11-apps/xwd-1.0.6 index 43724eff9b4c..d58a705e96c7 100644 --- a/metadata/md5-cache/x11-apps/xwd-1.0.6 +++ b/metadata/md5-cache/x11-apps/xwd-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xwd-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ecca61fd2314984ff92b8c046b704f70 diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.7 b/metadata/md5-cache/x11-apps/xwd-1.0.7 index 8026b4d8a1c9..9ba81d9a9183 100644 --- a/metadata/md5-cache/x11-apps/xwd-1.0.7 +++ b/metadata/md5-cache/x11-apps/xwd-1.0.7 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xwd-1.0.7.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ecca61fd2314984ff92b8c046b704f70 diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.5 b/metadata/md5-cache/x11-apps/xwininfo-1.1.5 index e2148d37e70f..2d1292677227 100644 --- a/metadata/md5-cache/x11-apps/xwininfo-1.1.5 +++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.5 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.6 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xwininfo-1.1.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=f7bbd652ae10dd534a1bb08f7d1b9ca0 diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.5 b/metadata/md5-cache/x11-apps/xwud-1.0.5 index 00d01496ad98..f92e12fa8c3b 100644 --- a/metadata/md5-cache/x11-apps/xwud-1.0.5 +++ b/metadata/md5-cache/x11-apps/xwud-1.0.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/xwud-1.0.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=3eed3f465e450f82e86de40ee82af59f diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz Binary files differindex 38665bd7a4c2..f68f37358544 100644 --- a/metadata/md5-cache/x11-base/Manifest.gz +++ b/metadata/md5-cache/x11-base/Manifest.gz diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.13 b/metadata/md5-cache/x11-base/xcb-proto-1.13 index b87960cc5626..1d2b7a0c91f8 100644 --- a/metadata/md5-cache/x11-base/xcb-proto-1.13 +++ b/metadata/md5-cache/x11-base/xcb-proto-1.13 @@ -10,5 +10,9 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5bf2e0ae0f17886ae1c20453143f1fe7 diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.5 b/metadata/md5-cache/x11-base/xorg-server-1.20.5 index 00cdd99a9022..d78f2d5fc123 100644 --- a/metadata/md5-cache/x11-base/xorg-server-1.20.5 +++ b/metadata/md5-cache/x11-base/xorg-server-1.20.5 @@ -12,5 +12,10 @@ RDEPEND=libglvnd? ( media-libs/libglvnd !app-eselect/eselect-opengl ) !libglvnd? REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive ) SLOT=0/1.20.5 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +_md5_=b46122bb7125932d1dca68fa1007bd3d +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 _md5_=ec5908aee3335bd7b63b5c14c1a14b59 +>>>>>>> next diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999 index 50d28bb230a5..a1c67eab9354 100644 --- a/metadata/md5-cache/x11-base/xorg-server-9999 +++ b/metadata/md5-cache/x11-base/xorg-server-9999 @@ -1,6 +1,10 @@ BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack +<<<<<<< HEAD +DEPEND=libglvnd? ( media-libs/libglvnd !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X,egl(+)] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) +======= DEPEND=libglvnd? ( media-libs/libglvnd !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X,egl(+)] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) +>>>>>>> next DESCRIPTION=X.Org X servers EAPI=7 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server @@ -8,8 +12,16 @@ IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind +glamor ipv6 libres LICENSE=MIT PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 ) PROPERTIES=live +<<<<<<< HEAD +RDEPEND=libglvnd? ( media-libs/libglvnd !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X,egl(+)] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting +REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive ) +SLOT=0/9999 +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +_md5_=4700f23a3491eb5fe02af2681e760364 +======= RDEPEND=libglvnd? ( media-libs/libglvnd !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X,egl(+)] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive ) SLOT=0/9999 _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 _md5_=d8f150e85b7ec2d18b9f0f55f978239d +>>>>>>> next diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz Binary files differindex cdeae0faeee9..094350058618 100644 --- a/metadata/md5-cache/x11-drivers/Manifest.gz +++ b/metadata/md5-cache/x11-drivers/Manifest.gz diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129 index 51249032e034..15f3cbc1e515 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129 @@ -11,5 +11,9 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools ) RESTRICT=bindist mirror SLOT=0/390 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.129/NVIDIA-FreeBSD-x86_64-390.129.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.129/NVIDIA-Linux-x86_64-390.129.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.129/NVIDIA-Linux-armv7l-gnueabihf-390.129.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.129/NVIDIA-FreeBSD-x86-390.129.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.129/NVIDIA-Linux-x86-390.129.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.129.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver 5b441d2bc890a1d3a9f6997f667386d7 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver 5b441d2bc890a1d3a9f6997f667386d7 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=bce98b8296124206ccbdc7ee2764dc5f diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50 index fe0065403429..f45b6ccbe3b2 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50 @@ -11,5 +11,10 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools ) RESTRICT=test SLOT=0/430 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/430.50/NVIDIA-FreeBSD-x86_64-430.50.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/430.50/NVIDIA-Linux-x86_64-430.50.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.50.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver 5b441d2bc890a1d3a9f6997f667386d7 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +_md5_=45a97e9997db6cb4fa4d38acaab6adf2 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver 5b441d2bc890a1d3a9f6997f667386d7 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 _md5_=8f03f01e5f9aa671d178f8d200b27081 +>>>>>>> next diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21 index 71a9e3912f13..f4874846e48a 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21 @@ -11,5 +11,9 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools ) RESTRICT=test SLOT=0/435 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 ) +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver 5b441d2bc890a1d3a9f6997f667386d7 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver 5b441d2bc890a1d3a9f6997f667386d7 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 +>>>>>>> next _md5_=9fbbbdb85d8d55f4c4e87869a28c7dab diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 index afd3461ace41..56a27c570c82 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 +++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=6a4c987096b9d78a668cfe167f992f60 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3 index 80327a2cd2a4..42574551593b 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3 +++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=2580a01f5cf3e24862a1492b128520da diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0 index db20f75207de..f1a931b5b05e 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0 +++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=1112c7e121025eac920631e4434c7cf1 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 index 737f96c11686..50e4e93b2490 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 +++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.29.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=e55901fa96f5c48b2cd70355e6acbbd1 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.3 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.3 index 79716110ef01..a8fc85b41cc7 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.3 +++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.3 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.7 x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=25866377ba027add44e8488ca9950da2 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 index baa611dd6f5c..40c8455cf559 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 +++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=fd95671d594b8bd061439d024d459c70 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 index 782f52bbfe87..d83b55d75228 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 +++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=23c2dbbc5fc4968e36b6222624289996 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 index aeb4b954d0fd..51f6cb036e7c 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 +++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=fc5416fc1cb117560f05ccdee97e17ca diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 index 5e415a881c35..56c23e8bc40d 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 +++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 @@ -7,5 +7,9 @@ LICENSE=MIT PROPERTIES=live RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d0a967e29368ceef906ba75327b06c58 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 index ecab93e87ded..620637bb308a 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 +++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.9.99.1 x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-void-1.4.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=3deed2f5e0bd4042c17f98f7dc796de2 diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 index beceb3a40b34..c72501c1cee6 100644 --- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 +++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 @@ -9,5 +9,9 @@ LICENSE=GPL-2 RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg] SLOT=0 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=38de417953d7cc723e05ae4f97893cf2 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5 b/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5 index 6469ee594ad0..804e3d44186d 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5 +++ b/metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ast-1.1.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=62df5593e5cefb957d6a482fa86de28c diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 index 0051956c037f..c75e5b9baf4d 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 +++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=7355982b9f3cb172e0b53f4bcf62898a diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0 index 52163899a973..461d9e4de5a9 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=2b1484ba04c6a783dce750dbca52bb4c diff --git a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20 b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20 index 10e2be6b3116..373d5e941324 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20 +++ b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20 @@ -10,5 +10,5 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14 SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-geode-2.11.20.tar.bz2 -_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 _md5_=2bf76cde8302daf455772cc32da78090 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9 index 6c397e0e1c38..dff6782e84c6 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9 +++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-glint-1.2.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=51f6a83660266a9e30566c4d07f5534f diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5 index 782c25ba86c2..22ee68299804 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5 +++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-1.6.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=46dcf963d7e53997e6ac510dce99d960 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 index 351cbc58a80c..f92bd12a2780 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-2.0.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=246ef410b278f4bb22c2764dba92c569 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16 index 5e5f9180baab..3dc5990c4841 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16 +++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=7b0325c6b7902a8cf9652927c4e31e72 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21 index 2c2dcae6cd28..6c1600be2f54 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21 +++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-nv-2.1.21.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=f4fd7251ae0c8e0a086db346dadf5d2d diff --git a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5 b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5 index f93feeaed505..32ad8eeca75d 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5 +++ b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-omap-0.4.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=f36b40a2c64372bd92f49193512f562a diff --git a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0 b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0 index 8bdcffbf4548..dc4ce3cbce76 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.9 x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=8080341c600df1386dd53b3848431215 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5 index 97c73ea107b1..9b213271a6f4 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5 +++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5 @@ -10,5 +10,9 @@ RDEPEND=xspice? ( app-emulation/spice python_targets_python2_7? ( >=dev-lang/pyt REQUIRED_USE=python_targets_python2_7 SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=f2ee3effa490c7480c3641531de1c874 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0 index 1a4a180b7bd5..c4363971f590 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.2 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-r128-6.12.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=37a68ec3809ee69729057ac2d68d915b diff --git a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9 b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9 index 81f436153e19..17a9968db37b 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9 +++ b/metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=00205438e05b8c1f700d1be3984cc78e diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0 index 434b5e816b10..0b2bbb3acb8c 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=!x11-drivers/xf86-video-virtualbox >=x11-base/xorg-server-1.8:=[-minimal] x11-libs/libXcomposite x11-libs/libpciaccess x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=8f0bd6c452a6d92529cf8311b8d4447f diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 index c1915046da05..75901b32f083 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=400530ba569d8bd0889ac929b9f5ebe3 diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0 index 67799f0d7dfa..2dfc43e23f80 100644 --- a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0 +++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=kernel_linux? ( x11-libs/libdrm[libkms,video_cards_vmware] media-libs/mesa[xa] ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess SLOT=0 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vmware-13.3.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=2962a27846cebf6ceb879037d04b61b7 diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz Binary files differindex 748bb0cdc36c..d37b7e0a2911 100644 --- a/metadata/md5-cache/x11-libs/Manifest.gz +++ b/metadata/md5-cache/x11-libs/Manifest.gz diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.10 b/metadata/md5-cache/x11-libs/libICE-1.0.10 index 630ba4d8bdbc..9d0da2dca6f1 100644 --- a/metadata/md5-cache/x11-libs/libICE-1.0.10 +++ b/metadata/md5-cache/x11-libs/libICE-1.0.10 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( dev-libs/libbsd ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libICE-1.0.10.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=d6d7d9ecc280695cc0032c33c1c82e01 diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.3 b/metadata/md5-cache/x11-libs/libSM-1.2.3 index 366009828599..46c8f3097f12 100644 --- a/metadata/md5-cache/x11-libs/libSM-1.2.3 +++ b/metadata/md5-cache/x11-libs/libSM-1.2.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libICE-1.0.8-r1[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(-)?] x11-libs/xtrans !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[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(-)?] ) ) ) ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libSM-1.2.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=fa4ec99091949a60226f232e55231949 diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 index 7ebfc9c29c71..2b0ec74cbb72 100644 --- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 +++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=42ab662b0f95f68ca2e5ff76ccfa090d diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.9 b/metadata/md5-cache/x11-libs/libXau-1.0.9 index b0ac5421749a..e8f0cb95e6e7 100644 --- a/metadata/md5-cache/x11-libs/libXau-1.0.9 +++ b/metadata/md5-cache/x11-libs/libXau-1.0.9 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXau-1.0.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=b29582c8798560972ae643e156041aaf diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1 b/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1 index 9e818119c8af..e1ebce4caf74 100644 --- a/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1 +++ b/metadata/md5-cache/x11-libs/libXaw-1.0.13-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXmu-1.1.1-r1[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(-)?] >=x11-libs/libXpm-3.5.10-r1[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(-)?] >=x11-libs/libXt-1.1.4[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXaw-1.0.13.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=b5792d4577d4d5392ddddaf6019e80ad diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.3 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.3 index 37c4f9822d4c..6da23044611f 100644 --- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.3 +++ b/metadata/md5-cache/x11-libs/libXaw3d-1.6.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e0d0f53b10b8707c2ac5a93a4dcd0ca0 diff --git a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d index 21846521327c..0cb8f9c3e6f3 100644 --- a/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d +++ b/metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) SLOT=0 SRC_URI=mirror://sourceforge/sf-xpaint/libXaw3dXft-1.6.2d.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=1d1221e39e4d3b0d718775219c65c163 diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1 b/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1 index 2060500d0bb0..306458b1de8d 100644 --- a/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1 +++ b/metadata/md5-cache/x11-libs/libXfixes-5.0.3-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXfixes-5.0.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=66c8a81ae1d7d9d1092fc94cfe0205f9 diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.4 b/metadata/md5-cache/x11-libs/libXfont2-2.0.4 index 1d20ab6152ed..8c1b5eb82024 100644 --- a/metadata/md5-cache/x11-libs/libXfont2-2.0.4 +++ b/metadata/md5-cache/x11-libs/libXfont2-2.0.4 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=5e1d208490fa002b2ad34b272d84029c diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.4 b/metadata/md5-cache/x11-libs/libXinerama-1.1.4 index 99f6e988c65a..82dde3a2c84b 100644 --- a/metadata/md5-cache/x11-libs/libXinerama-1.1.4 +++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.4 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXinerama-1.1.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=66d84f07c73f2fde11e9838c31e35853 diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1 b/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1 index 098263565a7b..d684c838519c 100644 --- a/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1 +++ b/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXt-1.1.4[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXpm-3.5.12.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e462b70ff95c637eececdad04316ec49 diff --git a/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1 b/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1 index 5f19b8ab9458..3afd1d11df19 100644 --- a/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1 +++ b/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto x11-libs/libX11[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXfixes[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(-)?] x11-libs/libXrandr[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXpresent-1.0.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=d8a43b417906ea969abc290ad1b60c93 diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1 b/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1 index f0f0a7fcff65..1efa165a2ad9 100644 --- a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1 +++ b/metadata/md5-cache/x11-libs/libXrender-0.9.10-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXrender-0.9.10.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e713e40a8e5fe24ad0322df81315bd73 diff --git a/metadata/md5-cache/x11-libs/libXres-1.2.0-r1 b/metadata/md5-cache/x11-libs/libXres-1.2.0-r1 index d37167cf1287..ac6fe042359b 100644 --- a/metadata/md5-cache/x11-libs/libXres-1.2.0-r1 +++ b/metadata/md5-cache/x11-libs/libXres-1.2.0-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXres-1.2.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=48d57f602765131c67c6cd87e28ea4bd diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1 b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1 index ade611708d74..b561ad976448 100644 --- a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1 +++ b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXtst-1.2.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=be92fd2469243a5b440ac31e3b30534c diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.11-r1 b/metadata/md5-cache/x11-libs/libXv-1.0.11-r1 index fa8613bfa0ac..3d096749e31f 100644 --- a/metadata/md5-cache/x11-libs/libXv-1.0.11-r1 +++ b/metadata/md5-cache/x11-libs/libXv-1.0.11-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXv-1.0.11.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=ceeee13b87f3eff04a01e181534b6cd1 diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.12 b/metadata/md5-cache/x11-libs/libXvMC-1.0.12 index 2903dad6fd3a..5cc9bde182b9 100644 --- a/metadata/md5-cache/x11-libs/libXvMC-1.0.12 +++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.12 @@ -1,6 +1,10 @@ BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig[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(-)?] DEFINED_PHASES=compile configure install prepare test unpack +<<<<<<< HEAD +DEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXv-1.0.10[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(-)?] x11-base/xorg-proto +======= DEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXv-1.0.10[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(-)?] !<x11-base/xorg-proto-2019.2 x11-base/xorg-proto +>>>>>>> next DESCRIPTION=X.Org XvMC library EAPI=7 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXvMC @@ -8,8 +12,16 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris LICENSE=MIT PDEPEND=app-eselect/eselect-xvmc +<<<<<<< HEAD +RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXv-1.0.10[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(-)?] +SLOT=0 +SRC_URI=https://www.x.org/releases/individual/lib/libXvMC-1.0.12.tar.bz2 +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +_md5_=9407bca1caafaa6f9b8a7e90f5f4c586 +======= RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXv-1.0.10[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(-)?] !<x11-base/xorg-proto-2019.2 SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXvMC-1.0.12.tar.bz2 _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 _md5_=c520cc42cbef6953a3a89a96b108d4f6 +>>>>>>> next diff --git a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4 b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4 index 3e9e8aec92b2..06eb608749f0 100644 --- a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4 +++ b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXxf86misc-1.0.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=a909e3f178a1e9cc6edfb2727c51a9a8 diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1 index ccb944e4e0ea..e5ce9842a9d9 100644 --- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1 +++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=e10def5e15618bcf974967a8f1517650 diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.4 b/metadata/md5-cache/x11-libs/libdmx-1.1.4 index a697df7d8771..b18997e06fb2 100644 --- a/metadata/md5-cache/x11-libs/libdmx-1.1.4 +++ b/metadata/md5-cache/x11-libs/libdmx-1.1.4 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libdmx-1.1.4.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=26d12f2e311b2b1854df1b0a68f7e6e3 diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.16 b/metadata/md5-cache/x11-libs/libpciaccess-0.16 index e55c8b395eca..1c8eb21060c2 100644 --- a/metadata/md5-cache/x11-libs/libpciaccess-0.16 +++ b/metadata/md5-cache/x11-libs/libpciaccess-0.16 @@ -10,5 +10,9 @@ LICENSE=MIT RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( >=sys-libs/zlib-1.2.8-r1:=[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(-)?] ) sys-apps/hwids SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libpciaccess-0.16.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +>>>>>>> next _md5_=6bb2bbbb1409c5693d1d6f79c7f8a8da diff --git a/metadata/md5-cache/x11-libs/libxcb-1.13.1 b/metadata/md5-cache/x11-libs/libxcb-1.13.1 index a11be45bcb39..ce16889ec256 100644 --- a/metadata/md5-cache/x11-libs/libxcb-1.13.1 +++ b/metadata/md5-cache/x11-libs/libxcb-1.13.1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[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(-)?] >=x11-libs/libXau-1.0.7-r1[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(-)?] >=x11-libs/libXdmcp-1.1.1-r1[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(-)?] SLOT=0/1.12 SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=00560235b793eac35d196f30fdf355e3 diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1 b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1 index 7b606f8d66aa..b69e94b05109 100644 --- a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1 +++ b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1 @@ -8,5 +8,9 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd LICENSE=MIT SLOT=0 SRC_URI=https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=43d8791eae085c39ac7a639ef07424c0 diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.12-r1 b/metadata/md5-cache/x11-libs/startup-notification-0.12-r1 index 6f8bc0a9b7cb..90ba85c738c8 100644 --- a/metadata/md5-cache/x11-libs/startup-notification-0.12-r1 +++ b/metadata/md5-cache/x11-libs/startup-notification-0.12-r1 @@ -9,5 +9,9 @@ LICENSE=LGPL-2 MIT RDEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8 SLOT=0 SRC_URI=https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=122e47c078466e858e4500c5bcdc919c diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1 b/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1 index 47feb841032d..245750a96744 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1 +++ b/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1 @@ -10,5 +10,9 @@ PDEPEND=>=x11-libs/xcb-util-cursor-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86 RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-0.4.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=5f75873c616b236a11f95251bc59448a diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2 index bdbb03864398..1a486ff913c1 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2 +++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[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(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[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(-)?] SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=8b33dd2e41f8145b9798a2453618950d diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1 index f2cf31ed6c5e..36b068bc7b6c 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1 +++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.9.1:=[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(-)?] >=x11-libs/xcb-util-0.4.0:=[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(-)?] SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-image-0.4.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=6c0f923d21d540a4b74ded08f8038a77 diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1 index 66d0852ea38e..ab3b66f61ca1 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1 +++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=x11-libs/libxcb:=[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(-)?] SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-keysyms-0.4.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=0288116b1578e1d59f41135cf317d29e diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2 index 32f6bcc2de45..b03b57dd2714 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2 +++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.9.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=933dd148108cbf4ce4365bb2e4fa5a71 diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2 index b83b25b8525c..f1dbdd0529d5 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2 +++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] SLOT=0 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-wm-0.4.1.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=3661002986e2cf827cdd2e42f78878b5 diff --git a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0 b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0 index d41b3997789d..60e7d3002afa 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0 +++ b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] x11-libs/xcb-util[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(-)?] SLOT=0 SRC_URI=https://github.com/Airblader/xcb-util-xrm/releases/download/v1.0/xcb-util-xrm-1.0.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=58edd6a77bbf1a1d7f16fdd35eee2257 diff --git a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.2 b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.2 index f608438365ef..5db414b902d0 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.2 +++ b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.2 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] x11-libs/xcb-util[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(-)?] SLOT=0 SRC_URI=https://github.com/Airblader/xcb-util-xrm/releases/download/v1.2/xcb-util-xrm-1.2.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=6107d91935b3b8c03258f1b41515c92d diff --git a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.3 b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.3 index 5258e54cb57f..85c2a84e857e 100644 --- a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.3 +++ b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.3 @@ -9,5 +9,9 @@ LICENSE=MIT RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] x11-libs/xcb-util[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(-)?] SLOT=0 SRC_URI=https://github.com/Airblader/xcb-util-xrm/releases/download/v1.3/xcb-util-xrm-1.3.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-multilib d4c92668ddddff2b1da2efb74daa43be autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=eea0dbf7a9ffcc80bb8e801ab000a491 diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz Binary files differindex 90e9a12c7219..1e341a515efa 100644 --- a/metadata/md5-cache/x11-misc/Manifest.gz +++ b/metadata/md5-cache/x11-misc/Manifest.gz diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.3 b/metadata/md5-cache/x11-misc/kronometer-2.2.3 index 021ce564be06..cc40a708aa07 100644 --- a/metadata/md5-cache/x11-misc/kronometer-2.2.3 +++ b/metadata/md5-cache/x11-misc/kronometer-2.2.3 @@ -10,5 +10,9 @@ LICENSE=GPL-2+ RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 SLOT=5 SRC_URI=mirror://kde/stable/kronometer/2.2.3/src/kronometer-2.2.3.tar.xz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=da541bb0004079f9915a4c58312e5302 diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999 index 4820d3265642..9f770fe52a3e 100644 --- a/metadata/md5-cache/x11-misc/xowl-9999 +++ b/metadata/md5-cache/x11-misc/xowl-9999 @@ -8,5 +8,9 @@ LICENSE=MIT PROPERTIES=live RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama SLOT=0 +<<<<<<< HEAD +_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=e33b819d9971dfb751faaccd64dde89e diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz Binary files differindex 4780a9250a91..b9bde6e876e1 100644 --- a/metadata/md5-cache/x11-plugins/Manifest.gz +++ b/metadata/md5-cache/x11-plugins/Manifest.gz diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz Binary files differindex e62e76ef01a4..512852499e18 100644 --- a/metadata/md5-cache/x11-terms/Manifest.gz +++ b/metadata/md5-cache/x11-terms/Manifest.gz diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz Binary files differindex ca052c8a4168..9c9451264647 100644 --- a/metadata/md5-cache/x11-themes/Manifest.gz +++ b/metadata/md5-cache/x11-themes/Manifest.gz diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0 index a5c9a61a57d6..fe23331ccd02 100644 --- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0 +++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0 @@ -11,5 +11,9 @@ REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 ) RESTRICT=test SLOT=0 SRC_URI=https://github.com/KDE/qtcurve/archive/v1.9.0.tar.gz -> qtcurve-1.9.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=9c4ae2f0e24ba42a41cc71af04813f74 diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1 index 50984d6e9534..c3f4c507847b 100644 --- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1 +++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1 @@ -12,5 +12,9 @@ REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 ) RESTRICT=test SLOT=0 SRC_URI=https://github.com/KDE/qtcurve/archive/1.9.0.tar.gz -> qtcurve-1.9.0.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=f92483de55bc4627ece731c7e9979622 diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999 index 70ade3af452a..72b1d797486e 100644 --- a/metadata/md5-cache/x11-themes/qtcurve-9999 +++ b/metadata/md5-cache/x11-themes/qtcurve-9999 @@ -11,5 +11,9 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 ) RESTRICT=test SLOT=0 +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1558ad40dd7aaa8bd306ff2f7ec1db8c diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6 index 264956cd2155..23316eb776cf 100644 --- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6 +++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.6 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXcursor SLOT=0 SRC_URI=https://www.x.org/releases/individual/data/xcursor-themes-1.0.6.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=3a6da898f5e5a556f56eb316d69207b1 diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz Binary files differindex d18345e07876..b5c16a44157e 100644 --- a/metadata/md5-cache/x11-wm/Manifest.gz +++ b/metadata/md5-cache/x11-wm/Manifest.gz diff --git a/metadata/md5-cache/x11-wm/twm-1.0.10 b/metadata/md5-cache/x11-wm/twm-1.0.10 index 029cc432f651..961c9e5b90f9 100644 --- a/metadata/md5-cache/x11-wm/twm-1.0.10 +++ b/metadata/md5-cache/x11-wm/twm-1.0.10 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.10.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=0edf10b7eb709d2110f28003209a533b diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999 index 4e7fef546374..b7339e0b60b2 100644 --- a/metadata/md5-cache/x11-wm/xoat-9999 +++ b/metadata/md5-cache/x11-wm/xoat-9999 @@ -9,5 +9,9 @@ LICENSE=MIT PROPERTIES=live RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu ) SLOT=0 +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=b365628b38fbf283c9e1facbe888bf33 diff --git a/metadata/news/Manifest b/metadata/news/Manifest index d4fc45d8c70f..9a1d1810a35e 100644 --- a/metadata/news/Manifest +++ b/metadata/news/Manifest @@ -2,6 +2,26 @@ Hash: SHA512 MANIFEST Manifest.files.gz 12431 BLAKE2B 01f85214679133e11f407d3d98aa7199014e62beb28441547ec80fbf152782842031346f8533b9d9dbab149da60f2faf8cc88276588df64076b57a424b536879 SHA512 46b9e6743aa054c2ca0f0a099c41383157eef0c6ca41b382f82afde381fedcfd5d2f0f05669d0c25db300bd3525ee0dcc8a7e3841488b1b176e1b611182af55a +<<<<<<< HEAD +TIMESTAMP 2019-09-25T17:39:04Z +-----BEGIN PGP SIGNATURE----- + +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2LpjhfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx +RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY +klBxdA//flXZlqLKJOpvxTpTDcpEPX0etVf5jz8W8SrBKzaar/fY6U4j5Wd2cdwT +GK5+riskK/nPbZhPFS5+vBnW5aYYqYCqpU5g7Uy0eBX3FHAaGVh9B9MfcoVTbz9M +q3V8SYnzANxoVuzn+KZJuJgzMuoEpvrjeqwvtSUeynQ1U9HxJg0LTuvldBmLJ2E/ +IsPX5o8NxJPyvHb8IPdIbvY1RTwIffYyXsMEeqlFUB639FSFC7rRYqfTpSdzUt4/ +AxfYZWhBiqMuma7k7ytw/Nz72HlYbXtSr9zpLRl5c1FY4QYrN5VqMjR2barL/2Qd +0rtU/nFXzLwJ38ByXeJVlhyddQ0hAT1aiSQ/KTp5B3sB74t3gd+mKUlFzmXwE0jx +1ACWini+8ea4+2xDSyNSzMXpUewuca43Gc/A+tfJrLH5m+xfAF+MnurfUDWA/+wz +I9KU9f1bWEqXxPbjP9nHBDQlv+OQ+ibSpgDSfWe9ezG8md9DONgxr+zXQnBgn9MQ +Bfo6drVEBmT/t6GrSwDjrIhv48FFGdtsjWXemPAmlT/uhpq6Q2DS/n7lfrRpn+Ym +8VUaGx3NytNQmjN5dG4HqpdEw7OkZppwJT/HE/uIdsFtXK8jSD85R8W4ri62Z2X/ +2UEmAvCQn22SXR9rUrMkBUtVaBe/fUFJkPcwiXnqFiZqkdDJkPY= +=IV1I +======= TIMESTAMP 2019-09-28T05:09:01Z -----BEGIN PGP SIGNATURE----- @@ -20,4 +40,5 @@ cmD4EjCu50DIPF330VYw9tQAq+m8cT7lfgwkhVCU/HAN0lPHGMQYMfuX7B9+gAYF Xmg/laSIPqXiOk//qjQYH33vWgEGixdm9dFe4pL2eTxwHWsngzEP0YUdrLyubhBT CL55Hp6tOfOPFzLuSyKqBUM0xNONI3G4nMAbm8TkgLYp+Xn86Ks= =5GuR +>>>>>>> next -----END PGP SIGNATURE----- diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 53bcac13ce10..e5e5d106f537 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1,5 @@ +<<<<<<< HEAD +Wed, 25 Sep 2019 17:39:00 +0000 +======= Sat, 28 Sep 2019 05:08:57 +0000 +>>>>>>> next diff --git a/metadata/timestamp b/metadata/timestamp index 9cb40af51523..ee5f1bcace62 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1,5 @@ +<<<<<<< HEAD +Wed Sep 25 17:39:00 UTC 2019 +======= Sat Sep 28 05:08:57 UTC 2019 +>>>>>>> next diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index fb92a3c07788..5c9c0411d7a7 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1,5 @@ +<<<<<<< HEAD +Wed, 25 Sep 2019 17:45:01 +0000 +======= Sat, 28 Sep 2019 05:15:01 +0000 +>>>>>>> next diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index 2b3a82e75a3f..3fe4d2c5aaa9 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1 +1,5 @@ +<<<<<<< HEAD +74076efd0c11461da7b26e0a03cd81988140f0d0 1569432784 2019-09-25T17:33:04+00:00 +======= a15d0f0526aa0dcb964abf8bef5e0348d577878e 1569643259 2019-09-28T04:00:59+00:00 +>>>>>>> next diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 9c5d2e2caea6..fe66260b8976 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1,5 @@ +<<<<<<< HEAD +1569432901 Wed 25 Sep 2019 05:35:01 PM UTC +======= 1569647101 Sat 28 Sep 2019 05:05:01 AM UTC +>>>>>>> next diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 53bcac13ce10..e5e5d106f537 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1,5 @@ +<<<<<<< HEAD +Wed, 25 Sep 2019 17:39:00 +0000 +======= Sat, 28 Sep 2019 05:08:57 +0000 +>>>>>>> next diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 9fea07db316e..6bd0c2aa0b51 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz Binary files differindex b8fbf4c9a698..f337c2eb97a9 100644 --- a/net-dns/Manifest.gz +++ b/net-dns/Manifest.gz diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest index afa39704dfdf..37407f3a6377 100644 --- a/net-dns/bind-tools/Manifest +++ b/net-dns/bind-tools/Manifest @@ -2,9 +2,19 @@ AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d881 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084 DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 +<<<<<<< HEAD +DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646 +DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0 +EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a +EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 +EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 +EBUILD bind-tools-9.15.2.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8 +EBUILD bind-tools-9.15.3.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8 +======= DIST bind-9.15.4.tar.gz 6307930 BLAKE2B e57c5874b18abb8daddee03ecca35ecc422106428b408f078b3e7beb42d986165f853c985996b70343c0cea113389edd2ea4fc53440328b352818def913d4bd7 SHA512 bd6ac320c553253f4c6befe9c5237f31e1172c35b14e34946b5082b333621f246755b2d2856542bee68f4cc411e955ac7dd4c84e2c7155949cbcfe469b5ae709 EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 EBUILD bind-tools-9.15.4.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8 +>>>>>>> next MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0 diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild new file mode 100644 index 000000000000..5a710f6efc50 --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +COMMON_DEPEND=" + caps? ( sys-libs/libcap ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:0= ) + )" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + !<net-dns/bind-9.10.2" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --without-python + --without-libjson + --without-zlib + --without-lmdb + --with-openssl="${EPREFIX}"/usr + $(use_with idn libidn2) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + ) + + # bug 607400 + if use libedit ; then + myeconfargs+=( --with-readline=-ledit ) + elif use readline ; then + myeconfargs+=( --with-readline=-lreadline ) + else + myeconfargs+=( --without-readline ) + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # to expose CMSG_* macros from sys/sockets.h + [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ +} + +src_install() { + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman nsupdate.1 + if use doc; then + docinto html + dodoc nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind-tools/bind-tools-9.15.3.ebuild b/net-dns/bind-tools/bind-tools-9.15.3.ebuild new file mode 100644 index 000000000000..5a710f6efc50 --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.15.3.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +COMMON_DEPEND=" + caps? ( sys-libs/libcap ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:0= ) + )" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + !<net-dns/bind-9.10.2" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --without-python + --without-libjson + --without-zlib + --without-lmdb + --with-openssl="${EPREFIX}"/usr + $(use_with idn libidn2) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + ) + + # bug 607400 + if use libedit ; then + myeconfargs+=( --with-readline=-ledit ) + elif use readline ; then + myeconfargs+=( --with-readline=-lreadline ) + else + myeconfargs+=( --without-readline ) + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # to expose CMSG_* macros from sys/sockets.h + [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ +} + +src_install() { + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman nsupdate.1 + if use doc; then + docinto html + dodoc nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index cc3b94f23c46..9da0fae19929 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -10,10 +10,20 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084 DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 +<<<<<<< HEAD +DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646 +DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0 +======= DIST bind-9.15.4.tar.gz 6307930 BLAKE2B e57c5874b18abb8daddee03ecca35ecc422106428b408f078b3e7beb42d986165f853c985996b70343c0cea113389edd2ea4fc53440328b352818def913d4bd7 SHA512 bd6ac320c553253f4c6befe9c5237f31e1172c35b14e34946b5082b333621f246755b2d2856542bee68f4cc411e955ac7dd4c84e2c7155949cbcfe469b5ae709 +>>>>>>> next DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac EBUILD bind-9.14.4.ebuild 11646 BLAKE2B 8112eb9963f76aeab8b708d1f859fb23fb9bdca794c5608dd62f97f616f2344288e895ef3b2d4201ee8efb14d935b73d38808b03efcba364f27c610e3d56990c SHA512 1318ea4e198956c1f28cddb2d5ed05b8583f02b4d03bc006183341690e19213f29f3a9f514a70e2ed2c22c969f4dfe35cbf3b32e7cd55a7ffb2d0008d565b213 EBUILD bind-9.14.5.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02 EBUILD bind-9.14.6.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02 +<<<<<<< HEAD +EBUILD bind-9.15.2.ebuild 11454 BLAKE2B 6c1ea71ffab3a2b9e3391da5250dc92d93a811faa88a837e14b2893d07696e669f97ecd62db0b5aaf66928b03487a720b8d45063e9d6ed83da496c8d45f57e21 SHA512 88022b4c1dc7a3065bd5cef960f1eeb9954e1f7f399472af5d9374838b95897130cb3f5565bd626b76b2a8574182095f7bc1d3909ff0f024ea85eed4583a6b63 +EBUILD bind-9.15.3.ebuild 11458 BLAKE2B 62acb41ae664893fdd657cdc5466bd14de8cdb5f91f16f644a0ca0edb31fd0237a053ed770c3309b9f9bbe2d480aa2c60ca173d611fab845c604bf178955bafe SHA512 7a55459af4d9f45783de288e512aedb591c73359807ea30cc31ed662b08f7242755dc7c74307472098acc148611a7bc2957749b3051b321d4487bfa6cc084b7d +======= EBUILD bind-9.15.4.ebuild 10943 BLAKE2B 73d58287c568a030ccd5c204645d1a15141506b20d32e5417089afb2d03db3e4efb07483af45d34d6bcf29adee36c1a1ce6b04adbe7d186d7b672c03a8a010dd SHA512 ef1ce8e4337b20521c04ef392fbf18f083a065c93683190b32c02c377a392308a3bae444268f735a1533e24d7435dd07e26b4abbb5cd3b2b920f237a5507edcf +>>>>>>> next MISC metadata.xml 1188 BLAKE2B 6da9a02bb959544829b980c3edfbe859b73e9f21485e78a23c00d9351fd933de5ba668ebffcffbec7da118116d95232ccaae7d4528de9c2dac6565cabc4f29cc SHA512 0589922970d0998c59e48e485c4475eede9a04cc5b029e1c4c2988d478e72287230613003777034b1df98042c0e7b4f79cfe22585c108b2c668d20710d43c655 diff --git a/net-dns/bind/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild new file mode 100644 index 000000000000..721776421718 --- /dev/null +++ b/net-dns/bind/bind-9.15.2.ebuild @@ -0,0 +1,380 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz + doc? ( mirror://gentoo/dyndns-samples.tbz2 )" +# sdb-ldap? ( +# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 +# )" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="" +# -berkdb by default re bug 602682 +IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi +json ldap libressl lmdb mysql odbc postgres python selinux static-libs +urandom xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE=" + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} )" +# sdb-ldap? ( dlz ) + +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + )" +# sdb-ldap? ( net-nds/openldap ) + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +pkg_setup() { + ebegin "Creating named group and user" + enewgroup named 40 + enewuser named 40 -1 /etc/bind named + eend ${?} +} + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Adjusting PATHs in manpages + for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do + sed -i \ + -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ + -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ + -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ + "${i}" || die "sed failed, ${i} doesn't exist" + done + +# if use dlz; then +# # sdb-ldap patch as per bug #160567 +# # Upstream URL: http://bind9-ldap.bayour.com/ +# # New patch take from bug 302735 +# if use sdb-ldap; then +# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch +# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ +# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ +# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ +# fi +# fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${EPREFIX}"/usr + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + # $(use_enable static-libs static) + $(use_with berkdb dlz-bdb) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json libjson) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with python) + $(use_with xml libxml2) + $(use_with zlib) + ) + + use geoip && myeconfargs+=( --enable-geoip ) + + # bug #158664 +# gcc-specs-ssp && replace-flags -O[23s] -O + + # To include db.h from proper path + use berkdb && append-flags "-I$(db_includedir)" + + export BUILD_CC=$(tc-getBUILD_CC) + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r3 named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r13 named + newconfd "${FILESDIR}"/named.confd-r7 named + + if use gost; then + sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \ + -i "${ED%/}/etc/init.d/named" || die + else + sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \ + -i "${ED%/}/etc/init.d/named" || die + fi + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${ED}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED}/usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym "${ED}"/var/bind/pri /etc/bind/pri + dosym "${ED}"/var/bind/sec /etc/bind/sec + dosym "${ED}"/var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_dotmpfilesd "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key || die + chmod 0640 /etc/bind/rndc.key || die + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + + if [[ -z "${CHROOT}" ]]; then + eerror "This config script is designed to automate setting up" + eerror "a chrooted bind/named. To do so, please first uncomment" + eerror "and set the CHROOT variable in '/etc/conf.d/named'." + die "Unset CHROOT" + fi + if [[ -d "${CHROOT}" ]]; then + ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + ewarn "To enable the old behaviour (without using mount) uncomment the" + ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + # As of bind 9.8.0 + if has_version net-dns/bind[gost]; then + mkdir -m 0755 -p ${CHROOT}/usr/$(get_libdir)/engines || die + if [ "$(get_libdir)" = "lib64" ]; then + ln -s lib64 ${CHROOT}/usr/lib || die + fi + fi + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + else + mknod ${CHROOT}/dev/random c 1 8 || die + chmod 0666 ${CHROOT}/dev/random || die + fi + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +} diff --git a/net-dns/bind/bind-9.15.3.ebuild b/net-dns/bind/bind-9.15.3.ebuild new file mode 100644 index 000000000000..bfdb5db3d257 --- /dev/null +++ b/net-dns/bind/bind-9.15.3.ebuild @@ -0,0 +1,380 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz + doc? ( mirror://gentoo/dyndns-samples.tbz2 )" +# sdb-ldap? ( +# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 +# )" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="" +# -berkdb by default re bug 602682 +IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi +json ldap libressl lmdb mysql odbc postgres python selinux static-libs +urandom xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE=" + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} )" +# sdb-ldap? ( dlz ) + +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + )" +# sdb-ldap? ( net-nds/openldap ) + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +pkg_setup() { + ebegin "Creating named group and user" + enewgroup named 40 + enewuser named 40 -1 /etc/bind named + eend ${?} +} + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Adjusting PATHs in manpages + for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do + sed -i \ + -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ + -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ + -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ + "${i}" || die "sed failed, ${i} doesn't exist" + done + +# if use dlz; then +# # sdb-ldap patch as per bug #160567 +# # Upstream URL: http://bind9-ldap.bayour.com/ +# # New patch take from bug 302735 +# if use sdb-ldap; then +# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch +# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ +# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ +# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ +# fi +# fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${EPREFIX}"/usr + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + # $(use_enable static-libs static) + $(use_with berkdb dlz-bdb) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json libjson) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with python) + $(use_with xml libxml2) + $(use_with zlib) + ) + + use geoip && myeconfargs+=( --enable-geoip ) + + # bug #158664 +# gcc-specs-ssp && replace-flags -O[23s] -O + + # To include db.h from proper path + use berkdb && append-flags "-I$(db_includedir)" + + export BUILD_CC=$(tc-getBUILD_CC) + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r3 named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r13 named + newconfd "${FILESDIR}"/named.confd-r7 named + + if use gost; then + sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \ + -i "${ED%/}/etc/init.d/named" || die + else + sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \ + -i "${ED%/}/etc/init.d/named" || die + fi + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym "${ED}"/var/bind/pri /etc/bind/pri + dosym "${ED}"/var/bind/sec /etc/bind/sec + dosym "${ED}"/var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_dotmpfilesd "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key || die + chmod 0640 /etc/bind/rndc.key || die + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + + if [[ -z "${CHROOT}" ]]; then + eerror "This config script is designed to automate setting up" + eerror "a chrooted bind/named. To do so, please first uncomment" + eerror "and set the CHROOT variable in '/etc/conf.d/named'." + die "Unset CHROOT" + fi + if [[ -d "${CHROOT}" ]]; then + ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + ewarn "To enable the old behaviour (without using mount) uncomment the" + ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + # As of bind 9.8.0 + if has_version net-dns/bind[gost]; then + mkdir -m 0755 -p ${CHROOT}/usr/$(get_libdir)/engines || die + if [ "$(get_libdir)" = "lib64" ]; then + ln -s lib64 ${CHROOT}/usr/lib || die + fi + fi + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + else + mknod ${CHROOT}/dev/random c 1 8 || die + chmod 0666 ${CHROOT}/dev/random || die + fi + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +} diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 65cbb5b8fbed..c1b877025e50 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -8,6 +8,10 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068 EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7 +<<<<<<< HEAD +EBUILD dnsmasq-2.80-r1.ebuild 4803 BLAKE2B f596685ea68a061c1319b6f49c9d27089bc0ef36822d6074cc70e02155d4866a97c2059077901b0576c96bf09ba6328bb74bc6f720553e635ca3758381ac05f9 SHA512 69fd9a952d9414842bc9cabec39b3ab065010ebcd93c6804208d7fb6085e0917c9a00679cc84b36fef2591b3bf838319a5d4f94f499f5d25b197ed9b28f944d7 +======= EBUILD dnsmasq-2.80-r1.ebuild 4798 BLAKE2B e9b667e47e20493d66035efca9db5e6f9095f899c58b6c8191d16d650806b6d5a981edb5aceaeaded932259257d2a7ec212dcc4a6a88c8e465ad48014562863b SHA512 5f6a03704fdf8eb3e7c50e4a0637ab2894caa8bfe054c20001a46cb55c58733254a8a0a968f9732276305667810d5c7001ba5a27e30d24fa2116d7e326fcb6ac +>>>>>>> next EBUILD dnsmasq-2.80.ebuild 4684 BLAKE2B 64850d70d7fe613c4e3b89944052ccba458f702e59f6d3f6b5228d4a32e65221c64a7ae9a168edd9499723276f0b8fab10a1f97d4b5eaab89c6c87359e7f652d SHA512 0a14dca3228b931f646d465de4426d2e48ae4e4a1c76637620e8a4d6e9c5cfd877ffd34b2841508a405749626e5fb6299cae5485a2529ca79cf891f66d4897a2 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild index faac080711b9..6e3d80b6e8ca 100644 --- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild @@ -11,7 +11,11 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" +<<<<<<< HEAD +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +======= KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +>>>>>>> next IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" IUSE+=" +inotify ipv6 lua nls script selinux static tftp" diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz Binary files differindex 38dfe79a383a..2d8159803f30 100644 --- a/net-im/Manifest.gz +++ b/net-im/Manifest.gz diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 353cc10e18ac..ff25c3fd9a8e 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz Binary files differindex 90027d669f2b..55eb05539093 100644 --- a/net-mail/Manifest.gz +++ b/net-mail/Manifest.gz diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest index 77e04e85d09b..65cd709d59a9 100644 --- a/net-mail/vpopmail/Manifest +++ b/net-mail/vpopmail/Manifest @@ -1,4 +1,6 @@ AUX 99vpopmail 64 BLAKE2B ab9b8b28494fa8093f1a72e582fc10787eb1f9814b860b1c03f4e336c6a8563b50b34fcc2c33d95e45703ebad5b8155d9575551c894af4e7c12b52748b526216 SHA512 8e9323006ddafae6e4ee8da2e0c9753ce11fd3f6e7c8bb6931ccc147ab6c9782c71d704222343be902f8784aa27a4425fd04a1f11cff5421dfc25fd76d3de953 +<<<<<<< HEAD +======= AUX vpopmail-5.4.33-clean-up-calling-maildrop.patch 2382 BLAKE2B 06f7ab5f6fdbb0dbade353dce74b2be585ed5a3f1ea617491ee437838f80c38b90f9e2c1a3a89efa6f788f30228e8e7449d8fdaa9db59c26231b16b849ce3f80 SHA512 99053bf41e405b22a4594104d3fce6ed831c6f5b8f8870bde7eb0e780948990de36158d7af055d881639503be1b911106a91f1787d524fe9c84fd3ec5503b055 AUX vpopmail-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch 3281 BLAKE2B 7eecc6c5dc2eef263d212ec6ca0534d0c00faeef04994e5410dbbff6e00beb7df249276fad928467b8cc87610d49666d9c63a629c87f8a07fb0ea5b35c298589 SHA512 1d170e611e914dc1ef5e7140b661558d93d2466fd310ebb50ecfcdadcb27cbfaa44b702ded5e02296835aea7c0a4c0d2de8ddf3cde236fe15a6fe0c37edb259a AUX vpopmail-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch 2150 BLAKE2B 44d3226b95e19b60516dbd2c4ace2ada5ec53ee1479f45544113e207da79b7152958d85f3b0511565e820732e49f32d73ce74ef253dd286a0f960e6b7cb39a92 SHA512 077d8b035f2ae33354c4c51d9d4c068b4de4d0f56c1a076667425c903707a39460c03b83ee9163cf8ef11b424bdb0ddcf2e716d0cfdbd3b50863069035d2a66b @@ -6,13 +8,19 @@ AUX vpopmail-5.4.33-remove-unneeded-forward-declaration.patch 771 BLAKE2B 565944 AUX vpopmail-5.4.33-strncat.patch 6266 BLAKE2B 98656fb8d963df082ec48fbf7918423c8aeeeab6aebaab295f819b213e09d20e7b786057bf2c2fcf0a276cf9fc65c10978957cdb37dbc7cee57c0ff3eef9e78f SHA512 831ec541a52fe5e72f97832927ce0c6b8a90c2954d715be1c088f5886bba6058b313e4364e164c0af90d1de90f0890f9a1b64d1985ef1d448ac34e5951b0a16b AUX vpopmail-5.4.33-unistd.patch 266 BLAKE2B 19dd429573f0b45b93cd35d522787029ba445c2f363a7a270ab1c547e4f0c2a7be89c287642a3e5e8d69ea59a82271aff271670d19d3850146e92a3389aa3dc8 SHA512 1cc6e6a067cabc004224c022af8c3ee90125a3b3daa9c346ca8a57962be30681a6181605624fc09a8992a7e3d3e7b3d8d6c0ce95095399c1a5dec798e9d6f6cd AUX vpopmail-5.4.33-vdelivermail-add-static.patch 1017 BLAKE2B 279bd5c2b894268910a89d1df206289fce475df9b655febc27eca6f1ecf1ecd6bc55e250d0eeb5e86e89a5df0543a08af34b379888ecb4590b91ba62b521b9f2 SHA512 bcf80e30d5010decad135a84527985a29d61d054a0396af662f33bc4a63c3dc1dd0585e884376f25babf0ca263d2496991b16d1c215962a64597f4cd1cd50ca0 +>>>>>>> next AUX vpopmail-5.4.9-access.violation.patch 922 BLAKE2B 038e5ee8483aceb521d2b8956af3fc2d166952d7ebba58960c247a90bda5ee73f2d33605c5e66f4ee667971a695251e1ef6b978d342bad9b4f34f0dfed0a6678 SHA512 eb9a37e3c2b5ad6faa9dcf8f07b240325ee2a3924dfc2abb3245972f8a892b7864f160c0475c1cbd3c5544f0844c20e20046b6a192b241bc8a3c90efe6797203 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9 AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107edfca033126fb420420a9b1eb8866a53552df110e8dca8cced2d653181eb2a6dfc3c07e33a958d7f86ad4035285 SHA512 df7a99357d4673f9d5c4619d67e418a769b2ab72c95d0a7477f186bf15fc4d0f6bec93a64970660439c25573dc0cd2994f5f4aca335723eeaec6761a7838f332 AUX vpopmail-lazy.patch 328 BLAKE2B 90cc8d6329e04348291df0ddeb5deb385f33cc7601b97fc6237233fcd51c12fccad824b609911aa3025912cd16a06fcc6c45dcc3390e190343f3ebf50e2b0619 SHA512 e89756acf8be564db00883f8e68a50bc96abb50b682a181c191f12c39f16ae4c71d5861fadc3279dd4a7e5ee5b513f502905da36006da583f239c396618133d6 AUX vpopmail-vpgsql.patch 2670 BLAKE2B c295ed94b878f4f9cad64cc36647c470718043b889331c9eb94bfc762b4a6e317c7f35a7bbf0bc67569ec72533b3f25abdbbf1f5218cfa8af097b417cd4909e7 SHA512 45f516310f5cf47be7a297022b17e353d2794d156ece4d3b163747545379a018927fbf37b9986e8c939a987b07b13e959d8fd5322c23ce96b441f75cfe42448d DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab +<<<<<<< HEAD +EBUILD vpopmail-5.4.33-r3.ebuild 9013 BLAKE2B 625c32e0e532422b0479a34f7f1e40314508cad4c7dbe7b86b45372a73d66fb277de7d4f79263a4db8f4203b818fb33b370aad80162746e0d120ae51dccd5d4d SHA512 7d89ee3d3301face0016eb03cadedc64b618f8ad743346a829b9148e4803fda47f7931fae79028d86f88c93c5d994e20912a1dc9b0709a9acec642fb8ec9d3ac +EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 0c3d9c5736e549d84be9604ece0a11fb064b4966f600fea5c1456ac92ddc25a4488c0fe328b53d12869a229426d98f333170b703484286804db1962e1c72f358 SHA512 8ad7fed94d1cf598ff019c04363ad4d3262716c4d460597c3886826d12b746f1b4151813526c7923225adc29165ba91db2d98bc988b8545bc659df0f5fcee0f6 +======= EBUILD vpopmail-5.4.33-r3.ebuild 9013 BLAKE2B 52cf5e2fd6d298bc6360e5438c9f3361c6a8e942e8c1f94ce555391de350860469016b54d4cd133b2e045bb8ecc2289e547d93af9b8efa41ebc10d1bf7ca7d9c SHA512 d0e9373f3a207130c8281c91b955f62cccd40d7ad61a523aa823610783f2b0f675bfab038857693ece63a12e6022f6a7a8d177be1469b38327aeadaaee9d93d1 EBUILD vpopmail-5.4.33-r4.ebuild 8003 BLAKE2B c1795b13757f230db9a86833c8cea20f78214303ff4d5a7d3d11210494c464661da9ae1ea1802c87a12584d274584c73933128624ca2b50b201a5f7eee5acc0f SHA512 79b283d5c5f5fd3ac42b950c517e1bdc1c71fc5db570722fbc7001175473974d48bdd2f392fd33a0322b595dbc65e34e07b31d1f3511d8b05030c466330988aa EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 585b4301997bcc0a13c40143338e29f2a054773c7477f3106dfd4ae71f787c15152f1fb9e84cf123c71092c42e0e42e96857ac5cb2ff1d918c87ffcb6f7c30fe SHA512 04ffa6437901fdb9f7d5a7f445dd60ff5f443d8c69add9a26d28c01f777195ea4d7f57bfef988c1452553b15d9a4fb8057ace7b6a004382f71e836fa4b9f9fdc +>>>>>>> next MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465 diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 77c833fd4a8f..ed4cc60de16a 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index 236ffd46bc56..a233f69810f8 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -2,7 +2,11 @@ DIST youtube-viewer-3.5.4.tar.gz 237736 BLAKE2B 900cd48025d28a1077f909a740d94824 DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63 DIST youtube-viewer-3.5.8.tar.gz 239590 BLAKE2B 7230518b87f77d153820ba8c60af8e017cbc7e5f65d96597673f5c9500f5116a63aac28f385eac92a0df9e7f36ea7c3af8c4efa5b1ad55ae66afdb03abad95d7 SHA512 1d657c08ccf4fc4d79408e2020fda1f9187ffc1b6faea5524b4190627b46d22336b8faff22330882507ac81e3717344fdef614ea57717c1face1807a835ef746 EBUILD youtube-viewer-3.5.4.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181 +<<<<<<< HEAD +EBUILD youtube-viewer-3.5.5.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c +======= EBUILD youtube-viewer-3.5.5.ebuild 2078 BLAKE2B 1837ac6173adf5ef912ee24629aab1ed60bd4b517afdb837bed91c116db388b781420ed8090922e4e382b9b8a0e5b3f8e8285bc4cb50e30562eb0b704236006b SHA512 0de363b4f06f55e7f474140984cefcc3fe0c279fd0733841ce2b200aa4d10b1324b7018c869b71210b4e0b4d93bdb70439c766338bfca88c7dd090d77215dac9 +>>>>>>> next EBUILD youtube-viewer-3.5.8.ebuild 2078 BLAKE2B 01429597f4165f51927b917bad7e9d98ed8d97e984246cc6a520f30722ff19d40dcacf97c57b7e094307368c5fd46727ba75b90b47d2ddefe035b565e606c151 SHA512 b134287f341b13dff777e469350e2ec40bd8126b89e5da0816a27906bfb39a40e5ec2c48d1809a8d98c64b2900019e6752c4f197cec9f21b2f5af30030378de2 EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6 diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz Binary files differindex 95a892d65084..5d23fe783d10 100644 --- a/net-p2p/Manifest.gz +++ b/net-p2p/Manifest.gz diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz Binary files differindex bde46c79ceaa..ee690c720ac4 100644 --- a/net-proxy/Manifest.gz +++ b/net-proxy/Manifest.gz diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz Binary files differindex bc1e5c028cd4..b8c6f74808f6 100644 --- a/net-vpn/Manifest.gz +++ b/net-vpn/Manifest.gz diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest index 3f55279e32cf..bba7a7ea404b 100644 --- a/net-vpn/networkmanager-strongswan/Manifest +++ b/net-vpn/networkmanager-strongswan/Manifest @@ -1,5 +1,9 @@ DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155 DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86 +<<<<<<< HEAD +EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 937 BLAKE2B 33513300bdd65cb15781efe51c1a4f2cd15e8102112af14d94ef1341742be99f1a237f84ef53e1062d2f47342e2a79cf35a8fa1388561f614e4712b25c7d5493 SHA512 5d0ffc3d027cc723d1ecce7e70d85939ce2bc31a145acff4f36c6d1abdccf7ba4a52eb5a496e836ccc3e7ffb19bab77ac289149c7168b685315c3eed3e87b3c2 +======= EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 936 BLAKE2B 78207ea40d5d41d8bda68ba8f6b17f1ffdcd7e32bd38eea7969a3cbc7963eba1f1b5b37edaddd7b62013519813b066f0836563222f470a46bac7d70713876e8b SHA512 a075b1a11aabfdcbf77643341b821e7dd2dd42985326939fea165348d89374c1c9a331b084b88bfc20755ae4dc2fca83b35cd016df732e8e8906073788e1d581 +>>>>>>> next EBUILD networkmanager-strongswan-1.4.5.ebuild 938 BLAKE2B 724227fcc4b69c3349ef731d40961012185b0493b813d7d6a1d12cf6d8af7b62c142502b01c693e6c7f12b29d326e7fb7c50dc2ee5be4085c8460cafe7e735b4 SHA512 d4cb58a862f228c0bdfccdf9f88f4473b8ca42c5b4a9a5d3a9415489d49c6f8f13d2328536fb2c1e24b41250c5db06d26047fc95691bd34b90b52c98381a1ed4 MISC metadata.xml 444 BLAKE2B 99927d1d0c6beeab7cd31eb4ac9dcc7afa038b54ac270cfb671fdcd6543e828147a7220854aeccada6823c5b7d32dfc3bd37924366896014c0341908b4b890d7 SHA512 5dc220ebf57644553266caa7e83d4478b6c7c665199b2bd26943afcb5680a0ed7597e4565043a2098fbad20cd9f5f3991877a4c171288f9ed2572923a7913c73 diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz Binary files differindex 37e56916a1cb..3612f2829689 100644 --- a/net-wireless/Manifest.gz +++ b/net-wireless/Manifest.gz diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest index de1f0e7dbe78..2afd755159de 100644 --- a/net-wireless/unifi/Manifest +++ b/net-wireless/unifi/Manifest @@ -4,13 +4,19 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995 DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b DIST unifi-5.11.47.zip 112374653 BLAKE2B 42e981f526dcdc7f7c35b7884aaa81cd96de4105d8700e8f8625a1fbd14640d248d46153328dbc852591f96221ab5753b65e2038d948a3d5b091f17b3e47e4bb SHA512 ec2a1f8e3a3c3bf5cf8ab25ece9ee164fbaaeef4b03585d2ff9add74a34992a24fe0becbd28b212b470d4fd87eea67e4291724addc8b12e5d1c463a73817569c +<<<<<<< HEAD +======= DIST unifi-5.11.48.zip 112379777 BLAKE2B da30a094350229aebdda958a966412a350c918d6d6cef775fce675bb139cb13f27dc5e3efbd7b68eb0a1b75adb11f9352cf330ca45af89bb9690c9d4a2505e8c SHA512 f09e2fd280cc6c1859d89536f9c517308c6945f7f4b38f9ef46a8231551284049baf50309ecc3cf7f9523b5c9f85758a56ee2520652c10ad22035491d8ee32d9 +>>>>>>> next DIST unifi-5.12.5.zip 113544662 BLAKE2B 7b79a1b107927fbb6ee2c7bb531901b5cedef0768146b369e8653e0e34e41758914b5108a01681e806c117dd80561091b6064bffe779e913774d61ff2fba369d SHA512 ff3ab833ce13889f1f6c2d1ee71f28bf8d48789c053c84b1f427e95e09aedb4d9f66a640a1891262f31300af50859581dc874a613f5f92b3bcf18b05c0140052 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989 EBUILD unifi-5.11.46-r1.ebuild 1789 BLAKE2B ec4e389a2bc3acfc0cf52a7d6bbc4e07efcfe38821a3a51b3c6295f4e736a0e1bae4e9e65f8886769e6b2f9bc22efb8cd26873c2d5847ca3a74d37b1e4b33b5f SHA512 2c1721e731fd9e800ffc331c1e79fa0fddfae5f29815b8780312a2b560ca7734b90f48502f267eb568f57320fe0c22c0a7efe233867c91c9bc48c987b9ee3342 EBUILD unifi-5.11.46.ebuild 1832 BLAKE2B e47b011986e7abc36e9df65eea9fcc1fb56a19dadc78a18c74699043cd0024b7d74676efcf9882e70d19247435ce0ff8e28dcc23ea905c4562b6285aae3685be SHA512 9b9cfc432580c3ecc8b8e79f73a5549f54fb6b46b23ff29ead84b85cc360bb091b278210d57e5889b319d3fa5c0a4a066fa01f4a85eab1e12b2c443f70c33bce EBUILD unifi-5.11.47.ebuild 1789 BLAKE2B f60faeba740a9e49e0bf313f62bbf6fcfa437652616206ae266518d39f330a0c5f01ae00de74139c4e5557dad0f13615e128230fcace4d0369d29a743462ce83 SHA512 7f10f359e1cd77333a4e59845fb844476ef973d968164361f0a0879a32da8c3427fec5692aeb06f66324177b464554a4d96bfeee520fbeeec752054fd0f0dc89 +<<<<<<< HEAD +======= EBUILD unifi-5.11.48.ebuild 1789 BLAKE2B d656f824d3312769b225b7e65e4c9abe2e9be318520c47c3794e87a96ef5d9deac9e763d981b8c27627802cd694e4bdd9b83d3a9de4d64a74a3af856ef01b4cb SHA512 0d75d95541a097cb0885d98bb4529688ef7513df7d28f793a2e4ecb679ac531384288db5cd1dc9db66c9ce8453d57d1d3efdb0a9aa642c8e64e81b0dc415ffde +>>>>>>> next EBUILD unifi-5.12.5-r1.ebuild 1789 BLAKE2B a2cc863351a4d4a0d4b210931a86de25220357d8479a86f13b3bbeadaf4e451af2f82b90ab433fb05154d70d678ebdc5db92cdd0e2f353ac9dc00022d2c45bd9 SHA512 8bfbd9d2cab24b2584880f42c2fd60748520147868c134ae34c4af8e1ead24501ddde7c4460a2884ded81dcd4ed8965f6274e1417eecc2742ff79af7d2b595d5 EBUILD unifi-5.12.5.ebuild 1833 BLAKE2B f9e7cae98e23b3525c628d0e987884f2e211d806073a97824bed45e4fb43dd131a849489d5c0bbb64cd7b865db71e600b9926a7b8ab38c70f2aa7e37e90dbb01 SHA512 46c149a06ee68e3e89a2ec3404c8eb501299649c2fd58a33a053d72caa85fc66cb1c6334e338d4aedcc3c3bee4bb18ae6468a2cdd882e46a213bb578cfc05d8d EBUILD unifi-5.6.42-r1.ebuild 1668 BLAKE2B 0db78f1241b651079c1c37326ef9c5414037c1bf192b344d55f9fd03a7af8f1cfc709f80b7257b9930f6c19d7cb77ec52e2cb5b492a571a60098436672c9514d SHA512 952253c6e51ac78796c7ee7729f75c1eaf0fa997832b60aaa7e9d73d0f6d3f444e632cd81550637733bf21ec1013d0a974edf12897dfc2fe70157403363eba86 diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz Binary files differindex ee68ac42b0d5..8590e8b1df45 100644 --- a/profiles/Manifest.gz +++ b/profiles/Manifest.gz diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 342f099dbd1d..92213a34744d 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,10 +1,13 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +<<<<<<< HEAD +======= # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27) # some testsuite deps are not keyworded sys-fs/zfs test-suite +>>>>>>> next # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21) # iasl is keyworded ~arm64 sys-firmware/seabios -debug diff --git a/profiles/package.mask b/profiles/package.mask index 2ebdaee903ad..72798308a697 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,6 +29,8 @@ #--- END OF EXAMPLES --- +<<<<<<< HEAD +======= # Stefan Strogin <steils@gentoo.org> (2019-09-27) # Requires >=dev-lang/lua-5.3 which is masked >=dev-util/bam-0.5.0 @@ -44,6 +46,7 @@ virtual/python-pmw # Blocks its own dependency. Bug #695606. =x11-libs/libXvMC-1.0.12 +>>>>>>> next # Joonas Niilola <juippis@gentoo.org> (2019-09-24) # Upstream decided to deprecate this service, and app. Removal in # ~30 days. Bug #695562 @@ -1096,6 +1099,59 @@ net-misc/libss7 games-rpg/eternal-lands-bloodsucker games-rpg/eternal-lands-data +<<<<<<< HEAD +# Michał Górny <mgorny@gentoo.org> (2019-08-28) +# Last touched in 2010. EAPI=0. Last upstream release in 2011 (pending +# bump). No reverse dependencies. +# Removal in 30 days. Bug #681168. +dev-embedded/scratchbox +dev-embedded/scratchbox-devkit-apt-https +dev-embedded/scratchbox-devkit-cputransp +dev-embedded/scratchbox-devkit-debian +dev-embedded/scratchbox-devkit-debian-squeeze +dev-embedded/scratchbox-devkit-doctools +dev-embedded/scratchbox-devkit-git +dev-embedded/scratchbox-devkit-maemo3 +dev-embedded/scratchbox-devkit-perl +dev-embedded/scratchbox-devkit-qemu +dev-embedded/scratchbox-devkit-svn + +# Michał Górny <mgorny@gentoo.org> (2019-08-27) +# Unmaintained. No release since 2008. Is reported to wrongly reject +# 'pretty much all mails', also reported build failure. +# Removal in 30 days. Bug #519668. +mail-filter/sid-milter + +# Michał Górny <mgorny@gentoo.org> (2019-08-27) +# Fails to build against openssl-1.1. Not touched by Gentoo maintainer +# who is also upstream since 2016, and the problem has been reported +# in Jan 2019. Removal in 30 days. Bug #674800. +app-crypt/af_alg + +# Michał Górny <mgorny@gentoo.org> (2019-08-27) +# Our version is seriously outdated and has numerous bugs reported, +# including multilib-strict failures preventing it from being installed +# on any modern system. It has not been touched since 2016, and is +# many releases behind upstream. Furthermore, upstream has discontinued +# it in favor of eeCodes. +# Removal in 30 days. Bug #628746. +sci-libs/grib_api + +# Michał Górny <mgorny@gentoo.org> (2019-08-27) +# Not touched since 2012. Homepage gone, and no replacement found. +# No reverse dependencies. +# Removal in 30 days. Bug #692796. +dev-tcltk/tkTheme + +# Michał Górny <mgorny@gentoo.org> (2019-08-27) +# Discontinued upstream, in favor of Tokyo Tycoon. Last release +# in 2010. Not touched by the Gentoo maintainer since 2010, with bugs +# having to be addressed by other developers. +# Removal in 30 days. Bug #681044. +net-misc/tokyotyrant + +======= +>>>>>>> next # Miroslav Šulc <fordfrog@gentoo.org> (2019-08-19) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.24 diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index ccff6341312e..f24c1293174e 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -22,6 +22,10 @@ mysql https://artfiles.org/mysql/ https://www.mirrorservice.org/sites/ftp.mysql nongnu http://download.savannah.nongnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/ openbsd https://cdn.openbsd.org/pub/OpenBSD https://cloudflare.cdn.openbsd.org/pub/OpenBSD https://fastly.cdn.openbsd.org/pub/OpenBSD openssl https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org +<<<<<<< HEAD +postgresql https://ftp.postgresql.org/pub/ +======= +>>>>>>> next pypi https://pypi.org/packages/source https://files.pythonhosted.org/packages/source qmail http://www.qmail.org/ http://qmail.geto.net/ http://qmail-mirror.jms1.net/ http://qmail.pandakc.com/ http://qmail.mirrors.auchnet.org/ http://qmail.glasswings.com.au/ http://qmail.ii.net/ http://infobase.ibase.com.hk/qmail/ http://qmail.morva.net/ http://qmail.teraren.com/ http://qmail.mirror.cdnetworks.com/ http://qmail.yongbok.net/ http://qmail.mirror.choon.net/ http://qmail.cbox.biz/ http://qmail.cbox.biz/ http://qmail.mirrors.ovh.net/ftp.qmail.org/ http://qmail.rasjonell.net/ http://qmail.europnews.de/ http://qmail.kendzorra.org/ http://qmail.mirror.gsnw.org/ http://mirrors.ntua.gr/qmail/ http://qmail.cti.gr/ http://qmail.dnsbeans.com/ http://qmail.hypergrid.it/ http://qmail.omnis.ch/ http://qmail.linorg.usp.br/ http://qmail.cavsystems.net/ http://qmail.mivzakim.net/ http://qmail.mirror.rise.ph/ quakeunity http://www.mirrorservice.org/sites/quakeunity.com diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz Binary files differindex c86c09617321..3f6c1cd56f9c 100644 --- a/sci-chemistry/Manifest.gz +++ b/sci-chemistry/Manifest.gz diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 05b55b396677..3b5053e587a9 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex d15bbbb91514..a9b9390bab02 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 3473265af33f..6b377eb28c10 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -11,7 +11,11 @@ DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999e DIST iproute2-5.3.0.tar.xz 742660 BLAKE2B e2152eb6c7d443f54bad0aec0cba23656c1defafc53f10130b63288f070e6e77c27a78a3f9bf6f6d14be3490eadd583a779f5d44ec23d16535e14abe04feb848 SHA512 c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157 EBUILD iproute2-4.19.0-r1.ebuild 4375 BLAKE2B 478751ceebaef4c53e975120662b7e5e35b845ca0568cd5866107265c976332661448c0fac1ea6277ef57392ab69ac8012d027e190508dc241821c8ad584f7b4 SHA512 630d8677750918d24be161edf6a8793f5c01ab120fd9b538cf3fde75704d52254e117782d30f70145f741a6d0cc6fd99025bfcb4714c8ce9466130c90f5ec277 EBUILD iproute2-5.1.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c +<<<<<<< HEAD +EBUILD iproute2-5.2.0-r1.ebuild 4482 BLAKE2B ac9ef5f32153c27d562bde81dca9178f72a511f0c6eac0974f3e6592e1e2d03173a196088080d2acba576fd31a769a91a0e49aa5f62633c0255c6a29ad1947af SHA512 d6585fdc96f7fe03e177a636edfbd2de98650d5fd28f4e7a1f9126e0f0b2a896fe52055d77f211a6808f91e82e98ead9c77e916e39cf132b9fa26c404e667ac1 +======= EBUILD iproute2-5.2.0-r1.ebuild 4477 BLAKE2B 82eecea5c98fd3ea3bf2063b32325506defa3001ce4dfb7fe5b9a3d0364f89d95ce0bd99cedcc9c30333880288bc85d9f1a25e3105ebe889ad3ad786de975d93 SHA512 68af3ab9ef46d0224a77a61d94f43744237e1f80bf1a50b0e3cda26f197b5e072896af87d90b08c152a7e28128a1ca37392ca52570584e4818737b90638fc0f9 +>>>>>>> next EBUILD iproute2-5.3.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c EBUILD iproute2-9999.ebuild 4380 BLAKE2B 37d298a23f7a6906fcfb6738f37b01af7adf62e51d78200dea1dc21c4fa5ba6d90774b53824c78e3ac8f465df5a4f7aa78cbc1fa501bd87c42da54eafe0bc285 SHA512 642d47e5287d3c5253ae2908ddb47041e398a7460896458f22ca5ad5371511696a05d8dd7f96b0d04bb99336c2cdf72b04ee7a3520ef133678a3fc8fe0b788f3 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2 diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz Binary files differindex 5385d24a4161..9a34d055f5e1 100644 --- a/sys-block/Manifest.gz +++ b/sys-block/Manifest.gz diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest index 13aedf9478ba..dbb3ba831a0d 100644 --- a/sys-block/nbd/Manifest +++ b/sys-block/nbd/Manifest @@ -2,7 +2,11 @@ DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a68 DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16 DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc EBUILD nbd-3.18.ebuild 1294 BLAKE2B 2d403e7c993df9acb2d90678fffd852154ee5d4eefcef4dd3e8c462b9f2bbb0d2d3adc76e3b9dc5de5cadc0883150a8b44a62cfaf5c8a13f38e5e274c29ff990 SHA512 c6cbfb3748c4380133060501ef1f4453f50f33d5a44008bdab9f4e0a1bdc748a5ef5b83accec9cd425689988b9d18f0cd359f1b641e6a9b8e4f30e91b3ede73e +<<<<<<< HEAD +EBUILD nbd-3.19.ebuild 1300 BLAKE2B 5b577d3a883821588764d6cfe3bc7e990e7493c7690a6664ecf54753c9b67d16caa2499b719a9323ff1a03b61b48b164462fe4eed88e77a3df393f7427e48386 SHA512 b6d18e6d129d0645c199344d0ce4ec6fa9f168783a126795b9d704de0c724c800f1c46888ddd9d115a5f429401bdfffab804349c80c863e802a7b39a83e005e8 +======= EBUILD nbd-3.19.ebuild 1296 BLAKE2B d277a7537f2b507081d34d3f4be80ac04e2b19c3740a643ce59ff8707508fbb0b53b34e1ec7dcf3916ec3434a7f7f990f00951ca43b3570c25c5db51aeace906 SHA512 aa3b0a5e795dc6d75959e92753bf784dbbf9258dcb03f098dc5c797f2c90d9f2c0bf567f013f239fec0f8a1c1fe5670dc16ba002859a65e16a5822a74f0cebc6 +>>>>>>> next EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0 diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex 7eb4e43a7939..42295265df67 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest index 84326640e9c4..e9c05e348989 100644 --- a/sys-cluster/kube-apiserver/Manifest +++ b/sys-cluster/kube-apiserver/Manifest @@ -6,11 +6,17 @@ DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299 +<<<<<<< HEAD +======= DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 +>>>>>>> next EBUILD kube-apiserver-1.13.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5 EBUILD kube-apiserver-1.14.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5 EBUILD kube-apiserver-1.14.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5 EBUILD kube-apiserver-1.15.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5 EBUILD kube-apiserver-1.15.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5 +<<<<<<< HEAD +======= EBUILD kube-apiserver-1.16.0.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5 +>>>>>>> next MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest index 34232dcc3c74..21cb6a5e0e8d 100644 --- a/sys-cluster/kube-controller-manager/Manifest +++ b/sys-cluster/kube-controller-manager/Manifest @@ -6,11 +6,17 @@ DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299 +<<<<<<< HEAD +======= DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 +>>>>>>> next EBUILD kube-controller-manager-1.13.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7 EBUILD kube-controller-manager-1.14.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7 EBUILD kube-controller-manager-1.14.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7 EBUILD kube-controller-manager-1.15.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7 EBUILD kube-controller-manager-1.15.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7 +<<<<<<< HEAD +======= EBUILD kube-controller-manager-1.16.0.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7 +>>>>>>> next MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest index da9cd53b133b..3a95bc3d0543 100644 --- a/sys-cluster/kube-proxy/Manifest +++ b/sys-cluster/kube-proxy/Manifest @@ -3,13 +3,19 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f +<<<<<<< HEAD +======= DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337 +>>>>>>> next DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 EBUILD kube-proxy-1.13.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f EBUILD kube-proxy-1.14.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f +<<<<<<< HEAD +======= EBUILD kube-proxy-1.14.7.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f +>>>>>>> next EBUILD kube-proxy-1.15.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f EBUILD kube-proxy-1.15.4.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f EBUILD kube-proxy-1.16.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest index fbbfd4ec356b..da4c2a5519fc 100644 --- a/sys-cluster/kube-scheduler/Manifest +++ b/sys-cluster/kube-scheduler/Manifest @@ -6,11 +6,17 @@ DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337 DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299 +<<<<<<< HEAD +======= DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 +>>>>>>> next EBUILD kube-scheduler-1.13.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274 EBUILD kube-scheduler-1.14.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274 EBUILD kube-scheduler-1.14.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274 EBUILD kube-scheduler-1.15.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274 EBUILD kube-scheduler-1.15.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274 +<<<<<<< HEAD +======= EBUILD kube-scheduler-1.16.0.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274 +>>>>>>> next MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest index 819b83771454..105dcafbd3ab 100644 --- a/sys-cluster/kubeadm/Manifest +++ b/sys-cluster/kubeadm/Manifest @@ -1,13 +1,19 @@ AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f +<<<<<<< HEAD +======= DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337 +>>>>>>> next DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 EBUILD kubeadm-1.13.10.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7 EBUILD kubeadm-1.14.6.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b +<<<<<<< HEAD +======= EBUILD kubeadm-1.14.7.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b +>>>>>>> next EBUILD kubeadm-1.15.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e EBUILD kubeadm-1.15.4.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e EBUILD kubeadm-1.16.0.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest index dd18f64ff7ff..a919cb1c5689 100644 --- a/sys-cluster/kubectl/Manifest +++ b/sys-cluster/kubectl/Manifest @@ -6,7 +6,11 @@ DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 EBUILD kubectl-1.13.10.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1 EBUILD kubectl-1.14.6.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3 +<<<<<<< HEAD +EBUILD kubectl-1.14.7.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3 +======= EBUILD kubectl-1.14.7.ebuild 1254 BLAKE2B 3184f7cccfcc48fa97f23af40cdc5fbf6903741a78c1c1936e8aa1915b0e7d1f4ad8e263769eda8093a0b9cc2224c4992c201e5df0b214d88235e605223e38a3 SHA512 4392b86b8ef111139cea7abf6017becd26b292e2f0b3c4b0bbdc124ba5308752c4935049e7cf0cab76ca8d41b74bfc51eb35a72e1ac3010ddc9d9d9e4bdf1d78 +>>>>>>> next EBUILD kubectl-1.15.3.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3 EBUILD kubectl-1.15.4.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3 EBUILD kubectl-1.16.0.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3 diff --git a/sys-cluster/kubectl/kubectl-1.14.7.ebuild b/sys-cluster/kubectl/kubectl-1.14.7.ebuild index f7acff2e23b4..eaf9590fedad 100644 --- a/sys-cluster/kubectl/kubectl-1.14.7.ebuild +++ b/sys-cluster/kubectl/kubectl-1.14.7.ebuild @@ -6,7 +6,11 @@ inherit golang-build golang-vcs-snapshot bash-completion-r1 EGO_PN="k8s.io/kubernetes" ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" +<<<<<<< HEAD +KEYWORDS="~amd64" +======= KEYWORDS="amd64" +>>>>>>> next DESCRIPTION="CLI to run commands against Kubernetes clusters" HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io" diff --git a/sys-cluster/kubectl/kubectl-1.15.4.ebuild~merged b/sys-cluster/kubectl/kubectl-1.15.4.ebuild~merged new file mode 100644 index 000000000000..7a61b25dce90 --- /dev/null +++ b/sys-cluster/kubectl/kubectl-1.15.4.ebuild~merged @@ -0,0 +1,47 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit golang-build golang-vcs-snapshot bash-completion-r1 + +EGO_PN="k8s.io/kubernetes" +ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="CLI to run commands against Kubernetes clusters" +HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND=">=dev-lang/go-1.12 + dev-go/go-bindata" + +RESTRICT="test" + +src_prepare() { + default + sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die + sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die +} + +src_compile() { + LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v + pushd src/${EGO_PN} || die + _output/bin/${PN} completion bash > ${PN}.bash || die + _output/bin/${PN} completion zsh > ${PN}.zsh || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin _output/bin/${PN} + + newbashcomp ${PN}.bash ${PN} + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} + + popd || die +} diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest index 1dce305311c0..8a5444585d91 100644 --- a/sys-cluster/kubelet/Manifest +++ b/sys-cluster/kubelet/Manifest @@ -5,13 +5,19 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0 DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f +<<<<<<< HEAD +======= DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337 +>>>>>>> next DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097 EBUILD kubelet-1.13.10.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a EBUILD kubelet-1.14.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f +<<<<<<< HEAD +======= EBUILD kubelet-1.14.7.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a +>>>>>>> next EBUILD kubelet-1.15.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f EBUILD kubelet-1.15.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f EBUILD kubelet-1.16.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 01749b3e2e4c..9589f88ca707 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index d73a1f797c5a..fbc27f86d720 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -137,11 +137,19 @@ EBUILD gcc-5.4.0-r6.ebuild 1286 BLAKE2B 176cf1828d2e8f16cdf1157326103becbb0af36d EBUILD gcc-5.5.0.ebuild 1285 BLAKE2B e0a5bcb01c51b656d4e6f11a8b4894de0de79da2aea5d9e17ea6ce619010244e68e2689923f65fb23553d912aa57f6d55d95688b5b22d4f5c4f1fb878aba4c61 SHA512 8ef8082806d79fb0786c65eb691838cd9735811ed54ed75c9ddc62968bbe5253ca7b6c6dd00bae32608ab076c52e5cd54522076745e6e1e24298b755f1ef5d1f EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6 EBUILD gcc-6.4.0-r5.ebuild 532 BLAKE2B fe0a860235c627ca870340098884f2aa14dc891d00dcdbc5afd81ef2db55a9006d63924b00457fe53e89b81abda549a08aa2b05a665ee2c3f256ba4d7af603f0 SHA512 da5b64937c62801ee0358fa2a6cd8e2b18baf2dd914b8fff644f03e1f6a31b2f788ba1a5633301c2500deefa29ba6f7cce6252ef98bceee20262f4c284213ff8 +<<<<<<< HEAD +EBUILD gcc-6.5.0-r1.ebuild 470 BLAKE2B 4fea17daab5bdeb872e284aec412ca9a150d70b2bb9c49ff1b4f6bae9cf9628505939b618675d0fb87b7d444230e157fc060a9ce41a9a4e9bfcc8633a27cf76f SHA512 4d3178700a579a38afc6d861133ab1db75b7c045d60b8afa2de1739712024eca8de9b4301c06dd1870f09b4c528d1affa1d88eaabd86677ad9e46ae86ba1902d +EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad +EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02 +EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c +EBUILD gcc-7.4.0-r2.ebuild 483 BLAKE2B 8d75e4fcc62e82a81494297894ac73920100ec1d13a039daafc9a0b290e633e91e8eb7af8b0f8d93ad261387645066314da75a0f4cd7f233dd90c6ceb5861f61 SHA512 160f49984268a4487540681c190f68906561e2cc459ea8df6b7d841ae35ff805b7b070436e434d91355008722e67bdcc54db07ae642746107622a69a3d5f59dc +======= EBUILD gcc-6.5.0-r1.ebuild 464 BLAKE2B 10626c5a86323b2e6296d1886838bda705159ca45cd9f1703428c678825f0afe0d07c6af7ed61954af131f9e55efb5b12485fb678504b19a58c03cb679276869 SHA512 cad65ddd4103904379d692c90f77dd7643cefde53eb65f380fb910601d4e578efeadbfb517b4edd822ef2daceff3fca5ffe97baa2486dfb1e483fa2c72cbe10c EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02 EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c EBUILD gcc-7.4.0-r2.ebuild 477 BLAKE2B 9c87491fcf792fce171b14f36b203e339e25470bde6ab69fd7387b30efd887b02e5bff5036819bc275a048d8658d50d793d2026588a1cc050392e334072e2d7b SHA512 22837c7eeb5965c3949de57692f98f90ddbf52326358dad37fed410168fb4b04becbe22bc2c3743b81e4a63c71e9b79ec1bbb67af658b745071644db33f91c6c +>>>>>>> next EBUILD gcc-8.2.0-r5.ebuild 491 BLAKE2B 302b288193a8cf89d93a53e9012e7686111e5195d2015b219adab5b302245d773519ca0c3193235d0b85974e7237b22beba4d43431e46c9b6e554dcadf816198 SHA512 8270e48c6287c4674318ff5aace71bfcf79dd1e96e7be381d6e87f2c97d42440610d9351403fc7ba30733581919cd992a42fba208991970ad1fcec305f7873a3 EBUILD gcc-8.2.0-r6.ebuild 573 BLAKE2B 812f00996ac141562556ec5f38a90d56fc208ab3a6ae19244dc2df90895fdd91568e261c1803ff9fd9fcba564b23068c41bdd40efa0b14fd7526b077663b3ff6 SHA512 27e4fb20f91ab261560a70190ab0127bb214afc776d9b168cdb32482b6d443afec1a6c479cc40ebdffd7753ba14ff66383cce6307ec0cdbef3ef30c1c7234bc5 EBUILD gcc-8.3.0-r1.ebuild 611 BLAKE2B c6de68f5d524ed9823eadfee85fceba96d10d5f38f30861dd57238b3cd585729828b8ca880c4de07647a0a633db2f3f76eae214c2bd36a2836f550d3e5c77f3b SHA512 4160d6e5927408bae6eb959b202f79f38701d3de6ce264e35997c156e4fd0e9f186bce61d573c3bd3528022adeba3030581aa49dcdf77bb4a3a09184964c2590 diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild index 03a1abde8722..32e8d79202ce 100644 --- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild +++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild @@ -7,7 +7,11 @@ PATCH_VER="2" inherit toolchain +<<<<<<< HEAD +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +======= KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +>>>>>>> next RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild index be950c718687..95b9174eef81 100644 --- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild +++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild @@ -7,7 +7,11 @@ PATCH_VER="1.3" inherit toolchain +<<<<<<< HEAD +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" +======= KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" +>>>>>>> next RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex df7c12afce82..55f1725be205 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index be52cfb41173..a4cf2d32c4df 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -14,5 +14,9 @@ DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bac EBUILD e2fsprogs-1.44.5.ebuild 3928 BLAKE2B a71cb0b55c3c27cd64cdff8f30c4df93487682665919bae9a36cf7edd9b05204d95dbd88614110e27b8ab607041ad6a089ad86e6dd684db8e571c41da097322f SHA512 017fe80104dedd930c47be814858693ed110b1bf969213ec161e260ff000ea23b8c925e5b94a1bd34db883cd5132e7f785aa0e7b9c7ff328c1451369dc452c1b EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 926c3cb6a6bed8b0d42541d6272b19eb270d00e08507148a9bd56f1f188730916c3b289bbca86d4aeedf1ee21ff6404b1141b7ce20b3f9edf43e030439646827 SHA512 d8358629d11e074c2bff189d54e540c46fa9875ff9b13e41ada9d567f0df02ea8f75b3d8aca287c4281973725e3cd852adbe916ebfe429b7976e6cd1edf335f8 EBUILD e2fsprogs-1.45.3.ebuild 4107 BLAKE2B 1dca4c3e02522b493e10a29612bcf11786c05295cc7dfe62a6076d47905d20d51ad798aa07c6e31894be51a234a83bf57ae4fb0d2dbc7f601cdadcd462f61e3b SHA512 9f412d36677410a52e5e3bbc3170c534a06bb7badf5ad576ae5ea61597cc4b02b364e11f4467e2bc46ac322e5af26417230884c309e39f45976766ba8b90fc05 +<<<<<<< HEAD +EBUILD e2fsprogs-1.45.4.ebuild 4107 BLAKE2B 1dca4c3e02522b493e10a29612bcf11786c05295cc7dfe62a6076d47905d20d51ad798aa07c6e31894be51a234a83bf57ae4fb0d2dbc7f601cdadcd462f61e3b SHA512 9f412d36677410a52e5e3bbc3170c534a06bb7badf5ad576ae5ea61597cc4b02b364e11f4467e2bc46ac322e5af26417230884c309e39f45976766ba8b90fc05 +======= EBUILD e2fsprogs-1.45.4.ebuild 4097 BLAKE2B 242fe8a116ed90cbdeac0a5fe931bb8bf21f132801ca9371699e1e96956658a85af86aac5fa63980ede8c9b72bb7930f03aaa5cc345f375530a821fddd25db92 SHA512 f41d120f4f09bc67a32b5547f0a4ab88e6fc4e4868c40bda3c6a5fafbc6c0a1f96b820efa544858d34db9e1b97b40ef92743589e2be25f97ac13f6eb64c8469c +>>>>>>> next MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild index 227c779bff73..5d0c596e0286 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild @@ -13,7 +13,11 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz LICENSE="GPL-2 BSD" SLOT="0" +<<<<<<< HEAD +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +======= KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +>>>>>>> next IUSE="cron fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex bc1ffb7bcff0..fdb4943a1091 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest index cf01774c00f2..b385000f60de 100644 --- a/sys-libs/e2fsprogs-libs/Manifest +++ b/sys-libs/e2fsprogs-libs/Manifest @@ -6,5 +6,9 @@ DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bac EBUILD e2fsprogs-libs-1.44.5.ebuild 2420 BLAKE2B 185bc676e63b1a9d4bbeeab3f93026d90c9f147b55b40161efb57596071e0bb9f6ef2b78a234de7d7006d9a2ac9de83d563a87f4469f8525401eb346bf1dc73e SHA512 1ac2a5bbd640ead26afbb89c5d30ea8e9c07af7754591a1bc5167e016ee0a3b16a3534cdf01a89608204bbec6e1cf556720c050d658cd1d011c5bc6eceeb44c6 EBUILD e2fsprogs-libs-1.45.2.ebuild 2420 BLAKE2B 81ee3f5d9d59a5add241ca79bfa2a0f9a112c16c4bb0b9970a1ee196540d2d98106c6a0d43bdad610d640407b56b312d0f58a4a6062bd311dedc96b0ecd96fe2 SHA512 be072a3070da4d0017347a9b62e09a2020410b48e29c8c9e680effa4dcd31d5cecc61604402f63dfa55256ace35b9c179fb7b6773ba0eaf8249f0144c0015939 EBUILD e2fsprogs-libs-1.45.3.ebuild 2433 BLAKE2B 25dcfee95771ef368e6b97fa8376b44dfd17e0761366b89b9a0614e5f9b9297521728b8712f6ed29ce63620092b3320c77d0dc6bebcf0a3d274ae6d17b7c245a SHA512 b5b7b987d17aa61e331cf2b7168dfcb5b7ee995fa89064cebd8ca6b636057cad389d357a78b2bef67851e9a85022e33d5a20b6a7e4eeb20355679b08439ec517 +<<<<<<< HEAD +EBUILD e2fsprogs-libs-1.45.4.ebuild 2433 BLAKE2B 25dcfee95771ef368e6b97fa8376b44dfd17e0761366b89b9a0614e5f9b9297521728b8712f6ed29ce63620092b3320c77d0dc6bebcf0a3d274ae6d17b7c245a SHA512 b5b7b987d17aa61e331cf2b7168dfcb5b7ee995fa89064cebd8ca6b636057cad389d357a78b2bef67851e9a85022e33d5a20b6a7e4eeb20355679b08439ec517 +======= EBUILD e2fsprogs-libs-1.45.4.ebuild 2423 BLAKE2B 3d9b199b83dae28de8d7c3b5e02f706cda33f051f0e6cb18988b8e91c1979493715fa16b976d1561f57b49a668e09b15397aa01ad192ee9be2b7a308c3f17eb2 SHA512 2bcac2ca11986ea48e6a54c77da019881a969c6b9f2aa2a95b98e92b04bd6eda030c3b271dc185145ebb865a96c047d0fdbdefd93e7124f5c9655f2469e85ac0 +>>>>>>> next MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild index b347e4ce3e9c..74adcf9a648d 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild @@ -15,7 +15,11 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz LICENSE="GPL-2" SLOT="0" +<<<<<<< HEAD +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris" +======= KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris" +>>>>>>> next IUSE="static-libs" RDEPEND="!sys-libs/com_err diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz Binary files differindex 1bb31c10ae02..b66ccf4b2d01 100644 --- a/virtual/Manifest.gz +++ b/virtual/Manifest.gz diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest index 7f4a1a33161d..90612b7122df 100644 --- a/virtual/libffi/Manifest +++ b/virtual/libffi/Manifest @@ -1,5 +1,9 @@ EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e EBUILD libffi-3.0.11.ebuild 601 BLAKE2B be01a763073cd8874f1c3ec07dcd0b9058536f43cc3adf9da5f5e893bffabd37a99971ef52c3dbd6e70db62595fbfe306094a54ae1b616a4a45c291f80fc6e62 SHA512 6651fd8cec053b59ea1297945bc590da58f147fc4d6fed6dcb2b08f8fc9b6277dc5a4124293fea79c2ffdcf85efdd1b799701fd10f84d6e64ad1829445b84cd8 EBUILD libffi-3.0.13-r1.ebuild 676 BLAKE2B 75a53a2cfe5ea7056c115adb95b980233fad60397c6e5b152b12d4214b0c4866181e48d8cb2ff4ca5868538cc3e46def2dc22c7b77f20b1d613844037c7b0b23 SHA512 e4a943c879412c740720192c9f659ff339226536fcc08b6df0d61845317cea622b24f0aa35071eae8ee8d507e44bad131aae3cd84a31aedb2ba916652d1a61df +<<<<<<< HEAD +EBUILD libffi-3.3_rc0.ebuild 716 BLAKE2B 04cbe11690a0db5e5d857f06ba10e8d4cab169b5ab846eb52d3161ff6ce1ba6e94f38d8e2886374057988cf812731f3018d9d6e745f2b354464a04fe12c57430 SHA512 c955a86ea696f7da5920824e98fb83231395dae6258b0d05adfa421f56d3c057b68890fc0cb216fb23c0b8038a0b45b8f43898489342ad55ceee733b7b7f73fa +======= EBUILD libffi-3.3_rc0.ebuild 714 BLAKE2B 32c0be2aded325b77a03faa04bf061322bc54a1a501f2c13048b0b5c1e80bdd70c65320067521d4077febed399a539644d8fddd3b1cbd781fe69ddb49bfbcfdc SHA512 e27dffbe1c3281de3aa44de04e9b57827d17572960facb0a963224e0ab24808f4d6de8c85d7753343b68b6811e02c2333df3bb8bf583f5bd30289ae5fc3f9459 +>>>>>>> next MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild index 9c1da0203ebb..42ada5056389 100644 --- a/virtual/libffi/libffi-3.3_rc0.ebuild +++ b/virtual/libffi/libffi-3.3_rc0.ebuild @@ -10,6 +10,10 @@ inherit multilib-build DESCRIPTION="A virtual for the Foreign Function Interface implementation" SLOT="0/7" # SONAME=libffi.so.7 +<<<<<<< HEAD +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]" diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz Binary files differindex 91dc2482bd97..aeffb0ca107f 100644 --- a/www-apps/Manifest.gz +++ b/www-apps/Manifest.gz diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz Binary files differindex 3fc2fc1a50a9..d5ba627aefd2 100644 --- a/www-client/Manifest.gz +++ b/www-client/Manifest.gz diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index da51aa66e5bd..5dff9232a2b4 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -17,8 +17,16 @@ AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d9 AUX chromium-unbundle-zlib.patch 750 BLAKE2B ffce4f4069fa8f04c41b8395105d4dbe2f7e38fb9a3b2fa826972b894825dd64ed23c2a86d1445e454a96d35ebaa059ae7c2df3d2baf986be068a47be072563d SHA512 539990ce23d38c10274d9f44bf61ad53adacccaa16646ebe9535c03d2fd468d5e722aadeae82ac244d64851bbfa48832ae0895743b957fc0f4e8f47f959b1e97 AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 +<<<<<<< HEAD +DIST chromium-77.0.3865.75.tar.xz 733233852 BLAKE2B e39856418a4dc0bcc690e0748781fd6d2395b2908d06616d44c76f5923d08f9ccd0cb1793447970302a47da631244aa96c7cf4d3df8cbd89fb3271badf163873 SHA512 7ab5103d75ddaeded69b63110a4ce401f4773017981eb2abaa650cc8a0c013323f7cd4beb19b6bfb6b0542a0269d86f6274da302b3b25d662c7a945f6d17f5d6 +DIST chromium-77.0.3865.90.tar.xz 729551228 BLAKE2B 865a40a7fa7d6a0b2de137249f7f14dad32b30cb0099fccc0d21570a2488834c5ab6504ef7c63f334e5d798de5391d6e96beaa49009caecb178d898e27317d89 SHA512 8b343c6ccc798c74cca8d5d41285153ace917da28360192afb21925c103ba425a4045f75c589f73a8c5c75bd1bbca44bfae1a4b96e9b7a97636d9929c7961bbc +DIST chromium-78.0.3887.7.tar.xz 737057024 BLAKE2B b4754f1fa9a243c29e83d6136494c6db1726a6d3f23013115a4a576428f7ca3c0fcd3f81cf7fe4037f2c3e6901b3fce015aeed7b7b945b4a3e368f2e6fb9afa1 SHA512 9b8eb33c6f19e5b247372e19a61ec1ae6c804bd7b9731222430e2e1b585146fc543a686ccfc9553d6d137999570c544cdb45696db6ce50c38dfead1b0760c1a4 +EBUILD chromium-77.0.3865.75.ebuild 22291 BLAKE2B e0ed8b94687369553ca9ce1732be0d32a42edf1da44945bf434ab1262fa7eb813a4717aecf107e535e706e6c12cef1c8641b4b67e5c114bef74b582e3591eed4 SHA512 3f73a684c682ead5df785a6e92a72ec857eb47bbbb24940c142b3710001e8ff5d0dcadf5ec509ebc666ce206f1e35d1aed0b8d8f56361ea3d4f7fc79886bb4ff +EBUILD chromium-77.0.3865.90.ebuild 22339 BLAKE2B ae6d1adf172feef35a9431d9b9e2da92dda6f78541a9df025c2b5378ad18b4e8af8d9abfc100c9e3cf3dd8412cd92e4122acd616775c1a939eb03d06dda6211c SHA512 af67612a5a827188c2537d3d250ed06be46dd9101e3a24767ee769e3daa8ba59340c7179f988bb35fa49cd653f7c7269476bc8ac0716dd0bb26cc3d755224386 +======= DIST chromium-77.0.3865.90.tar.xz 729551228 BLAKE2B 865a40a7fa7d6a0b2de137249f7f14dad32b30cb0099fccc0d21570a2488834c5ab6504ef7c63f334e5d798de5391d6e96beaa49009caecb178d898e27317d89 SHA512 8b343c6ccc798c74cca8d5d41285153ace917da28360192afb21925c103ba425a4045f75c589f73a8c5c75bd1bbca44bfae1a4b96e9b7a97636d9929c7961bbc DIST chromium-78.0.3887.7.tar.xz 737057024 BLAKE2B b4754f1fa9a243c29e83d6136494c6db1726a6d3f23013115a4a576428f7ca3c0fcd3f81cf7fe4037f2c3e6901b3fce015aeed7b7b945b4a3e368f2e6fb9afa1 SHA512 9b8eb33c6f19e5b247372e19a61ec1ae6c804bd7b9731222430e2e1b585146fc543a686ccfc9553d6d137999570c544cdb45696db6ce50c38dfead1b0760c1a4 EBUILD chromium-77.0.3865.90.ebuild 22338 BLAKE2B 8bbd4f4dcfd47c9c5c7a78f65596c8f2cf4ff0bf9f128932ac71205a81b30c23437146938f11d669a951c58ad6115a7fb3118a7b74a09660d5e770a11be1cd66 SHA512 5dd6836a12276abc8f8f5bd671051aa50203c7f4520ef37c8bce8c8426f947fd2bf3e2ae02b48e10fd7ee13d4375f8ec853efd6c7cd8c7ece3af662126334002 +>>>>>>> next EBUILD chromium-78.0.3887.7.ebuild 22186 BLAKE2B ec114167e5ce94eb792a11543cf3153b72422f22ea31bffc7dc63996bea69085b9abcfa727d4a57da910dc3396ebda4b57c8145ac6001d18ad064511d2b5fd84 SHA512 fd4570d712ae264d878792cb262f73cf70f900a934f8e8138a9694d57886a2592baab40e95d93d12348405b11c20b9d026603f494e41b7c307d24ddc37250939 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187 diff --git a/www-client/chromium/chromium-77.0.3865.75.ebuild b/www-client/chromium/chromium-77.0.3865.75.ebuild new file mode 100644 index 000000000000..cede40c2b38c --- /dev/null +++ b/www-client/chromium/chromium-77.0.3865.75.ebuild @@ -0,0 +1,727 @@ +# Copyright 2009-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" +RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" +REQUIRED_USE="component-build? ( !suid )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-atk-2.26:2 + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + >=dev-libs/atk-2.26 + dev-libs/expat:= + dev-libs/glib:2 + system-icu? ( >=dev-libs/icu-64:= ) + >=dev-libs/libxml2-2.9.4-r3:=[icu] + dev-libs/libxslt:= + dev-libs/nspr:= + >=dev-libs/nss-3.26:= + >=dev-libs/re2-0.2016.11.01:= + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + >=media-libs/harfbuzz-2.4.0:0=[icu(-)] + media-libs/libjpeg-turbo:= + media-libs/libpng:= + system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) + >=media-libs/openh264-1.6.0:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( + >=media-video/ffmpeg-4:= + || ( + media-video/ffmpeg[-samba] + >=net-fs/samba-4.5.10-r1[-debug(-)] + ) + !=net-fs/samba-4.5.12-r0 + media-libs/opus:= + ) + sys-apps/dbus:= + sys-apps/pciutils:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + app-arch/snappy:= + media-libs/flac:= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + kerberos? ( virtual/krb5 ) +" +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND="${COMMON_DEPEND} + !<www-plugins/chrome-binary-plugins-57 + x11-misc/xdg-utils + virtual/opengl + virtual/ttf-fonts + selinux? ( sec-policy/selinux-chromium ) + tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) +" +DEPEND="${COMMON_DEPEND} +" +# dev-vcs/git - https://bugs.gentoo.org/593476 +BDEPEND=" + ${PYTHON_DEPS} + >=app-arch/gzip-1.7 + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-util/gn + dev-vcs/git + >=dev-util/gperf-3.0.3 + >=dev-util/ninja-1.7.2 + >=net-libs/nodejs-7.6.0[inspector] + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + closure-compile? ( virtual/jre ) + virtual/pkgconfig +" + +: ${CHROMIUM_FORCE_CLANG=no} + +if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then + BDEPEND+=" >=sys-devel/clang-7" +fi + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. + +For native file dialogs in KDE, install kde-apps/kdialog. +" + +PATCHES=( + "${FILESDIR}/chromium-compiler-r10.patch" + "${FILESDIR}/chromium-widevine-r4.patch" + "${FILESDIR}/chromium-fix-char_traits.patch" + "${FILESDIR}/chromium-unbundle-zlib.patch" + "${FILESDIR}/chromium-77-fix-gn-gen.patch" + "${FILESDIR}/chromium-77-system-icu.patch" + "${FILESDIR}/chromium-77-system-hb.patch" + "${FILESDIR}/chromium-77-clang.patch" + "${FILESDIR}/chromium-77-blink-include.patch" + "${FILESDIR}/chromium-77-std-string.patch" + "${FILESDIR}/chromium-77-no-cups.patch" + "${FILESDIR}/chromium-77-gcc-abstract.patch" + "${FILESDIR}/chromium-77-gcc-include.patch" +) + +pre_build_checks() { + if [[ ${MERGE_TYPE} != binary ]]; then + local -x CPP="$(tc-getCXX) -E" + if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then + die "At least gcc 8.0 is required" + fi + fi + + # Check build requirements, bug #541816 and bug #471810 . + CHECKREQS_MEMORY="3G" + CHECKREQS_DISK_BUILD="7G" + if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then + CHECKREQS_DISK_BUILD="25G" + if ! use component-build; then + CHECKREQS_MEMORY="16G" + fi + fi + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + default + + mkdir -p third_party/node/linux/node-linux-x64/bin || die + ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die + + local keeplibs=( + base/third_party/cityhash + base/third_party/dmg_fp + base/third_party/dynamic_annotations + base/third_party/icu + base/third_party/nspr + base/third_party/superfasthash + base/third_party/symbolize + base/third_party/valgrind + base/third_party/xdg_mime + base/third_party/xdg_user_dirs + buildtools/third_party/libc++ + buildtools/third_party/libc++abi + chrome/third_party/mozilla_security_manager + courgette/third_party + net/third_party/mozilla_security_manager + net/third_party/nss + net/third_party/quic + net/third_party/uri_template + third_party/abseil-cpp + third_party/angle + third_party/angle/src/common/third_party/base + third_party/angle/src/common/third_party/smhasher + third_party/angle/src/common/third_party/xxhash + third_party/angle/src/third_party/compiler + third_party/angle/src/third_party/libXNVCtrl + third_party/angle/src/third_party/trace_event + third_party/angle/third_party/glslang + third_party/angle/third_party/spirv-headers + third_party/angle/third_party/spirv-tools + third_party/angle/third_party/vulkan-headers + third_party/angle/third_party/vulkan-loader + third_party/angle/third_party/vulkan-tools + third_party/angle/third_party/vulkan-validation-layers + third_party/apple_apsl + third_party/axe-core + third_party/blink + third_party/boringssl + third_party/boringssl/src/third_party/fiat + third_party/boringssl/src/third_party/sike + third_party/boringssl/linux-aarch64/crypto/third_party/sike + third_party/boringssl/linux-x86_64/crypto/third_party/sike + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl + third_party/brotli + third_party/cacheinvalidation + third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin + third_party/catapult/third_party/beautifulsoup4 + third_party/catapult/third_party/html5lib-python + third_party/catapult/third_party/polymer + third_party/catapult/third_party/six + third_party/catapult/tracing/third_party/d3 + third_party/catapult/tracing/third_party/gl-matrix + third_party/catapult/tracing/third_party/jszip + third_party/catapult/tracing/third_party/mannwhitneyu + third_party/catapult/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako + third_party/ced + third_party/cld_3 + third_party/closure_compiler + third_party/crashpad + third_party/crashpad/crashpad/third_party/lss + third_party/crashpad/crashpad/third_party/zlib + third_party/crc32c + third_party/cros_system_api + third_party/dav1d + third_party/dawn + third_party/devscripts + third_party/dom_distiller_js + third_party/emoji-segmenter + third_party/flatbuffers + third_party/flot + third_party/freetype + third_party/glslang + third_party/google_input_tools + third_party/google_input_tools/third_party/closure_library + third_party/google_input_tools/third_party/closure_library/third_party/closure + third_party/googletest + third_party/hunspell + third_party/iccjpeg + third_party/inspector_protocol + third_party/jinja2 + third_party/jsoncpp + third_party/jstemplate + third_party/khronos + third_party/leveldatabase + third_party/libXNVCtrl + third_party/libaddressinput + third_party/libaom + third_party/libaom/source/libaom/third_party/vector + third_party/libaom/source/libaom/third_party/x86inc + third_party/libjingle + third_party/libphonenumber + third_party/libsecret + third_party/libsrtp + third_party/libsync + third_party/libudev + third_party/libwebm + third_party/libxml/chromium + third_party/libyuv + third_party/llvm + third_party/lss + third_party/lzma_sdk + third_party/markupsafe + third_party/mesa + third_party/metrics_proto + third_party/modp_b64 + third_party/nasm + third_party/node + third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 + third_party/one_euro_filter + third_party/openscreen + third_party/openscreen/src/third_party/tinycbor/src/src + third_party/ots + third_party/pdfium + third_party/pdfium/third_party/agg23 + third_party/pdfium/third_party/base + third_party/pdfium/third_party/bigint + third_party/pdfium/third_party/freetype + third_party/pdfium/third_party/lcms + third_party/pdfium/third_party/libopenjpeg20 + third_party/pdfium/third_party/libpng16 + third_party/pdfium/third_party/libtiff + third_party/pdfium/third_party/skia_shared + third_party/perfetto + third_party/pffft + third_party/ply + third_party/polymer + third_party/protobuf + third_party/protobuf/third_party/six + third_party/pyjson5 + third_party/qcms + third_party/rnnoise + third_party/s2cellid + third_party/sfntly + third_party/simplejson + third_party/skia + third_party/skia/include/third_party/skcms + third_party/skia/include/third_party/vulkan + third_party/skia/third_party/gif + third_party/skia/third_party/skcms + third_party/skia/third_party/vulkan + third_party/smhasher + third_party/spirv-headers + third_party/SPIRV-Tools + third_party/sqlite + third_party/swiftshader + third_party/swiftshader/third_party/llvm-7.0 + third_party/swiftshader/third_party/llvm-subzero + third_party/swiftshader/third_party/subzero + third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 + third_party/unrar + third_party/usrsctp + third_party/vulkan + third_party/web-animations-js + third_party/webdriver + third_party/webrtc + third_party/webrtc/common_audio/third_party/fft4g + third_party/webrtc/common_audio/third_party/spl_sqrt_floor + third_party/webrtc/modules/third_party/fft + third_party/webrtc/modules/third_party/g711 + third_party/webrtc/modules/third_party/g722 + third_party/webrtc/rtc_base/third_party/base64 + third_party/webrtc/rtc_base/third_party/sigslot + third_party/widevine + third_party/woff2 + third_party/zlib/google + url/third_party/mozilla + v8/src/third_party/siphash + v8/src/third_party/valgrind + v8/src/third_party/utf8-decoder + v8/third_party/inspector_protocol + v8/third_party/v8 + + # gyp -> gn leftovers + base/third_party/libevent + third_party/adobe + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + third_party/yasm/run_yasm.py + ) + if ! use system-ffmpeg; then + keeplibs+=( third_party/ffmpeg third_party/opus ) + fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi + if ! use system-libvpx; then + keeplibs+=( third_party/libvpx ) + keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) + fi + if use tcmalloc; then + keeplibs+=( third_party/tcmalloc ) + fi + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die +} + +src_configure() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local myconf_gn="" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then + # Force clang since gcc is pretty broken at the moment. + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + myconf_gn+=" is_clang=false" + fi + + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + + if tc-is-cross-compiler; then + tc-export BUILD_{AR,CC,CXX,NM} + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" + else + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + fi + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=false" + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=$(usex component-build true false)" + + # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md + myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" + + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + # Use system-provided libraries. + # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + + # libevent: https://bugs.gentoo.org/593458 + local gn_system_libraries=( + flac + fontconfig + freetype + # Need harfbuzz_from_pkgconfig target + #harfbuzz-ng + libdrm + libjpeg + libpng + libwebp + libxml + libxslt + openh264 + re2 + snappy + yasm + zlib + ) + if use system-ffmpeg; then + gn_system_libraries+=( ffmpeg opus ) + fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi + if use system-libvpx; then + gn_system_libraries+=( libvpx ) + fi + build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=true" + + # Optional dependencies. + myconf_gn+=" closure_compile=$(usex closure-compile true false)" + myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" + myconf_gn+=" enable_widevine=$(usex widevine true false)" + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" + myconf_gn+=" use_kerberos=$(usex kerberos true false)" + myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" + + # TODO: link_pulseaudio=true for GN. + + myconf_gn+=" fieldtrial_testing_like_official_build=true" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + # Trying to use gold results in linker crash. + myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" + + # Disable forced lld, bug 641556 + myconf_gn+=" use_lld=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" + myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + myconf_gn+=" google_api_key=\"${google_api_key}\"" + myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" + myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" + + local myarch="$(tc-arch)" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 + fi + fi + + if [[ $myarch = amd64 ]] ; then + myconf_gn+=" target_cpu=\"x64\"" + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + myconf_gn+=" target_cpu=\"x86\"" + ffmpeg_target_arch=ia32 + + # This is normally defined by compiler_cpu_abi in + # build/config/compiler/BUILD.gn, but we patch that part out. + append-flags -msse2 -mfpmath=sse -mmmx + elif [[ $myarch = arm64 ]] ; then + myconf_gn+=" target_cpu=\"arm64\"" + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + myconf_gn+=" target_cpu=\"arm\"" + ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm) + else + die "Failed to determine target arch, got '$myarch'." + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gn+=" fatal_linker_warnings=false" + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # https://bugs.gentoo.org/654216 + addpredict /dev/dri/ #nowarn + + #if ! use system-ffmpeg; then + if false; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gn.py || die + popd > /dev/null || die + fi + + einfo "Configuring Chromium..." + set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release + echo "$@" + "$@" || die +} + +src_compile() { + # Final link uses lots of file descriptors. + ulimit -n 2048 + + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die + + # Build mksnapshot and pax-mark it. + local x + for x in mksnapshot v8_context_snapshot_generator; do + if tc-is-cross-compiler; then + eninja -C out/Release "host/${x}" + pax-mark m "out/Release/host/${x}" + else + eninja -C out/Release "${x}" + pax-mark m "out/Release/${x}" + fi + done + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release chrome chromedriver + use suid && eninja -C out/Release chrome_sandbox + + pax-mark m out/Release/chrome + + # Build manpage; bug #684550 + sed -e 's|@@PACKAGE@@|chromium-browser|g; + s|@@MENUNAME@@|Chromium|g;' \ + chrome/app/resources/manpage.1.in > \ + out/Release/chromium-browser.1 || die +} + +src_install() { + local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome + + if use suid; then + newexe out/Release/chrome_sandbox chrome-sandbox + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + fi + + doexe out/Release/chromedriver + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin + doins out/Release/*.pak + doins out/Release/*.so + + if ! use system-icu; then + doins out/Release/icudtl.dat + fi + + doins -r out/Release/locales + doins -r out/Release/resources + + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi + + # Install icons and desktop entry. + local branding size + for size in 16 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser \ + "Chromium" \ + chromium-browser \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml + + # Install manpage; bug #684550 + doman out/Release/chromium-browser.1 + dosym chromium-browser.1 /usr/share/man/man1/chromium.1 + + readme.gentoo_create_doc +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/chromium-77.0.3865.90.ebuild b/www-client/chromium/chromium-77.0.3865.90.ebuild index 8e52aecdb552..a22e92ceac21 100644 --- a/www-client/chromium/chromium-77.0.3865.90.ebuild +++ b/www-client/chromium/chromium-77.0.3865.90.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" REQUIRED_USE="component-build? ( !suid )" diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index 46606ef1949b..8c0a0054eed6 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1,3 +1,8 @@ +<<<<<<< HEAD +DIST google-chrome-beta_78.0.3904.21-1_amd64.deb 64127558 BLAKE2B 6be143cdfeed71a2af35bb3e899fe274d35ea85c735ed4e8b4ed249c15d06379a496668de060c25c95043e4675dc8e45922ef6de4f9468c837864fd39b1124b3 SHA512 70f86d835b181edfe7a350ccb5b6c7813744cf900521c589e8c45434ec4c5540e2ef21f2b77f169c918f817f921d874b2e70c2502e1b2412f2b89ebfbb7cddce +EBUILD google-chrome-beta-78.0.3904.21.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 +======= DIST google-chrome-beta_78.0.3904.34-1_amd64.deb 64476112 BLAKE2B c7a97ac3c6035101cc98b15f1df006267e9cd6d6449e35f50832db3df26781a6adf4c38e3ae8bce22673f99a61aed7cbfe26caec6aec84dd1654f4401be2051e SHA512 5fb7bc112d10c0909d9c4cb5e9432bd4fbb4384d29cd509d87f6041ab6dd61ebdb7dbd2526602aef01ae67a05e569a2e884e1cea1c9f298ee9529d4618ea5e3e EBUILD google-chrome-beta-78.0.3904.34.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 +>>>>>>> next MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57 diff --git a/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.21.ebuild b/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.21.ebuild new file mode 100644 index 000000000000..fa060d36e118 --- /dev/null +++ b/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.21.ebuild @@ -0,0 +1,131 @@ +# Copyright 2011-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils + +DESCRIPTION="The web browser from Google" +HOMEPAGE="https://www.google.com/chrome" + +if [[ ${PN} == google-chrome ]]; then + KEYWORDS="-* amd64" + MY_PN=${PN}-stable +else + KEYWORDS="-* ~amd64" + MY_PN=${PN} +fi + +MY_P="${MY_PN}_${PV}-1" + +SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" + +LICENSE="google-chrome" +SLOT="0" +RESTRICT="bindist mirror strip" + +DEPEND="" +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-arch/bzip2 + app-misc/ca-certificates + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + >=dev-libs/nss-3.26 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype:2 + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + >=x11-libs/libX11-1.5.0 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + x11-libs/libxcb + x11-libs/pango + x11-misc/xdg-utils +" + +QA_PREBUILT="*" +QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" +S=${WORKDIR} +CHROME_HOME="opt/google/chrome${PN#google-chrome}" + +pkg_nofetch() { + eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." +} + +pkg_pretend() { + # Protect against people using autounmask overzealously + use amd64 || die "google-chrome only works on amd64" +} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config +} + +src_unpack() { + : +} + +src_install() { + dodir / + cd "${ED}" || die + unpacker + + rm -r etc usr/share/menu || die + mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + + gzip -d usr/share/doc/${PF}/changelog.gz || die + gzip -d usr/share/man/man1/${MY_PN}.1.gz || die + if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then + rm usr/share/man/man1/google-chrome.1.gz || die + dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1 + fi + + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + local suffix= + [[ ${PN} == google-chrome-beta ]] && suffix=_beta + [[ ${PN} == google-chrome-unstable ]] && suffix=_dev + + local size + for size in 16 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png + done + + pax-mark m "${CHROME_HOME}/chrome" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index f2283f1c0dae..799321c6e62f 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,3 +1,8 @@ +<<<<<<< HEAD +DIST google-chrome-unstable_78.0.3904.17-1_amd64.deb 64972850 BLAKE2B 88812fa32376b4dbc85b8dfbd38d30ab592c5eb01c57a4230d451b5855565addeb3b2bfb7e59b7cb622dc24bea67d0ab58db51ba6e38642d54f62f9b9ff3fc4e SHA512 edd2599acea92b73e912b8d8ec95549a29af16c636b6ec38a74ca464dcdbe6e46e63c34a74d0135a4d34fc6c91d3e89eee25d078f0b130b905cac67c1ed4037f +EBUILD google-chrome-unstable-78.0.3904.17.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 +======= DIST google-chrome-unstable_79.0.3921.0-1_amd64.deb 65310386 BLAKE2B dbab67768d7fd0fe5fcef6073dbb6ad6891831812e2adf04974ed7820ab01201104889992df4c491a497be2ceda16b858f9b916358b55f3e58b547489c3ee97a SHA512 71c1bd003aa0bc80b477d1b47e33890f26f8c6a8aa2822d4da5f70c736384e884f04be1583daa2b27ecbb21b79d9b16eabceffdf0f98d691f84ec64bbf4fa73a EBUILD google-chrome-unstable-79.0.3921.0.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 +>>>>>>> next MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3904.17.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3904.17.ebuild new file mode 100644 index 000000000000..fa060d36e118 --- /dev/null +++ b/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3904.17.ebuild @@ -0,0 +1,131 @@ +# Copyright 2011-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils + +DESCRIPTION="The web browser from Google" +HOMEPAGE="https://www.google.com/chrome" + +if [[ ${PN} == google-chrome ]]; then + KEYWORDS="-* amd64" + MY_PN=${PN}-stable +else + KEYWORDS="-* ~amd64" + MY_PN=${PN} +fi + +MY_P="${MY_PN}_${PV}-1" + +SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" + +LICENSE="google-chrome" +SLOT="0" +RESTRICT="bindist mirror strip" + +DEPEND="" +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-arch/bzip2 + app-misc/ca-certificates + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + >=dev-libs/nss-3.26 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype:2 + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + >=x11-libs/libX11-1.5.0 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + x11-libs/libxcb + x11-libs/pango + x11-misc/xdg-utils +" + +QA_PREBUILT="*" +QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" +S=${WORKDIR} +CHROME_HOME="opt/google/chrome${PN#google-chrome}" + +pkg_nofetch() { + eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." +} + +pkg_pretend() { + # Protect against people using autounmask overzealously + use amd64 || die "google-chrome only works on amd64" +} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config +} + +src_unpack() { + : +} + +src_install() { + dodir / + cd "${ED}" || die + unpacker + + rm -r etc usr/share/menu || die + mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + + gzip -d usr/share/doc/${PF}/changelog.gz || die + gzip -d usr/share/man/man1/${MY_PN}.1.gz || die + if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then + rm usr/share/man/man1/google-chrome.1.gz || die + dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1 + fi + + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + local suffix= + [[ ${PN} == google-chrome-beta ]] && suffix=_beta + [[ ${PN} == google-chrome-unstable ]] && suffix=_dev + + local size + for size in 16 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png + done + + pax-mark m "${CHROME_HOME}/chrome" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index daa5796a095c..4fe1049d793a 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,5 +1,14 @@ +<<<<<<< HEAD +DIST opera-beta_64.0.3417.11_amd64.deb 67591076 BLAKE2B 2826b68521274ef148c88f16bd19659826bd013a82bb84b6d4ca9317cb1ab121c2fdcd7ecb51fdb368f5ba87671b721f21701838688c1dc236a386cd1ae2571e SHA512 3110c502cf3bb74f5122e9d97ef9d278e1aaab24aeb42da989705efed85dd05815e0b4b2004e6e9d7c01aa7acae8b035a83bb32449a514ec833ac5d803b98fe3 +DIST opera-beta_64.0.3417.19_amd64.deb 66568892 BLAKE2B 20897486d69140f5db89ccb7e93492712b76fa4b035b2a63da88bc047ac92ffab66be67598850e177fcc6e264222da497f520d905a18f4c0ec7f95456a991c05 SHA512 7ec028311ccdcb49681336f3951616c645356373e6cf0b8976c43e8b4580a0818ee8b8d26bc8edcacfcdab4b8b0890cd27b8e539bec7eda01cdb8c769250aee1 +DIST opera-beta_64.0.3417.8_amd64.deb 66468202 BLAKE2B cacfce4db714ef83e7130bb2d5729541aa4e86d1645e0b80009c7b6a354fbf459976a692b4b24a5f5a4afabb292a87f5be8c5b1f74d6ac5ba0e2724f2bc52569 SHA512 783d875986f0ca64bbe049370cac718982075412fa07e27830452b0b6df630f9121add83caa5dae5758bf6f67d71876aea36ef0011739eaf98980bb053680569 +EBUILD opera-beta-64.0.3417.11.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12 +EBUILD opera-beta-64.0.3417.19.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12 +EBUILD opera-beta-64.0.3417.8.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12 +======= DIST opera-beta_64.0.3417.19_amd64.deb 66568892 BLAKE2B 20897486d69140f5db89ccb7e93492712b76fa4b035b2a63da88bc047ac92ffab66be67598850e177fcc6e264222da497f520d905a18f4c0ec7f95456a991c05 SHA512 7ec028311ccdcb49681336f3951616c645356373e6cf0b8976c43e8b4580a0818ee8b8d26bc8edcacfcdab4b8b0890cd27b8e539bec7eda01cdb8c769250aee1 DIST opera-beta_64.0.3417.32_amd64.deb 67607274 BLAKE2B 465824c7227049f769b74089bbaa8d077736ea8a02a2e4b8eb6c590b0696c932b9c02dedd647350f12a475c585fd5f838c756f1cb6e0b410e83c863ac3a603a9 SHA512 86f188a0ffd651e92a1f3f2f4587d7c2323c898377474ccba583088dd2087b6c6fb7cd0253b0e824715d1cdbf570cbe76a0f2488e2d30086478d42a19e4c0d0d EBUILD opera-beta-64.0.3417.19.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12 EBUILD opera-beta-64.0.3417.32.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12 +>>>>>>> next MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest index 7aa651d0a4e5..97f57661df78 100644 --- a/www-client/opera-developer/Manifest +++ b/www-client/opera-developer/Manifest @@ -1,5 +1,14 @@ +<<<<<<< HEAD +DIST opera-developer_65.0.3437.0_amd64.deb 67898864 BLAKE2B 464e41d39caf40b21292ef42f13c86ac603b5662da6f1fca82a8caa6eb8ea29b51941227cf9bb3cb4bc204c5786675ca5b410f4f176070bf2d88642a26510e40 SHA512 9d902b2d952be4b481b3bda4a4fc770ff974931310bff49911f4f600539a32ad95c370bf61a45ea8a349322a9f00a9e68188c566b897acbe16bf3d795b861bb5 +DIST opera-developer_65.0.3445.0_amd64.deb 67306400 BLAKE2B 332d7effb7bdda78ee3d07e5f1b7316eb20ac9d20c53eabb0ffdecb6843fef9ba80e552c3db57497ca9c8a2011e92f3bd34fad5b674a21ff8aa43ceb34439683 SHA512 1c555be779fd8abc5523fb1f05e20ba1993e644910957b49626095b38f24d511dff5ec5be8423f7b5c1b424130a61545f7abcaf866b0281e6be320f6b1dcfa94 +DIST opera-developer_65.0.3450.0_amd64.deb 67254338 BLAKE2B a5d73da103813ba9f797686e8ae0f6be6185957507df72c83883740b06fe34b2a07ba089cd74cc2513a58815475b676e7b6ad02f9507b0a2d0f66a39c7a013af SHA512 b032d0d30dbf6b9a7881980514bc6c0722180ee64957fd3d818417756e5deea442d72555b1dd451210c3d3486ad06bf180a9b469ca41ee8c8252037729453f1a +EBUILD opera-developer-65.0.3437.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03 +EBUILD opera-developer-65.0.3445.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03 +EBUILD opera-developer-65.0.3450.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03 +======= DIST opera-developer_65.0.3450.0_amd64.deb 67254338 BLAKE2B a5d73da103813ba9f797686e8ae0f6be6185957507df72c83883740b06fe34b2a07ba089cd74cc2513a58815475b676e7b6ad02f9507b0a2d0f66a39c7a013af SHA512 b032d0d30dbf6b9a7881980514bc6c0722180ee64957fd3d818417756e5deea442d72555b1dd451210c3d3486ad06bf180a9b469ca41ee8c8252037729453f1a DIST opera-developer_65.0.3454.0_amd64.deb 67222124 BLAKE2B 00aaaa42a7ca91f534fc95b694db21d119fa11ad8b9a880f9c0f86e9fbf55d553516884670e8bf6af5b0ca2ab0a1e13d788d8178c4b4a8b20ed1a6c099648cfc SHA512 8cbde0d68cf5c9734dbc32bb1572efe8915c95c5d54977178aa45d4e3444cba0140fec9ea020de7190dd5f27d6575f601708a229d76dff8d4e2aabfabf3e7ca5 EBUILD opera-developer-65.0.3450.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03 EBUILD opera-developer-65.0.3454.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03 +>>>>>>> next MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 diff --git a/www-client/opera-developer/opera-developer-65.0.3445.0.ebuild b/www-client/opera-developer/opera-developer-65.0.3445.0.ebuild new file mode 100644 index 000000000000..132f88d22363 --- /dev/null +++ b/www-client/opera-developer/opera-developer-65.0.3445.0.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CHROMIUM_LANGS=" + be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it + ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi + zh-CN zh-TW +" +inherit chromium-2 multilib unpacker xdg-utils + +DESCRIPTION="A fast and secure web browser" +HOMEPAGE="https://www.opera.com/" +LICENSE="OPERA-2014" +SLOT="0" +SRC_URI_BASE=" + https://download1.operacdn.com/pub/ + https://download2.operacdn.com/pub/ + https://download3.operacdn.com/pub/ + https://download4.operacdn.com/pub/ +" +SRC_URI="amd64? (" +for uri in ${SRC_URI_BASE}; do +SRC_URI+=" + "${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" +" +done +SRC_URI+=")" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-misc/curl + net-print/cups + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libnotify + x11-libs/pango[X] +" + +QA_PREBUILT="*" +S=${WORKDIR} + +src_unpack() { + unpack_deb ${A} +} + +pkg_setup() { + OPERA_HOME="usr/$(get_libdir)/${PN}" +} + +src_prepare() { + default + + case ${ARCH} in + amd64) + mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die + rm -r usr/lib || die + ;; + x86) + mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die + ;; + esac + + mv usr/share/doc/${PN} usr/share/doc/${PF} || die + gunzip usr/share/doc/${PF}/changelog.gz || die + + rm usr/bin/${PN} || die + + pushd "${OPERA_HOME}/localization" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + sed -i \ + -e 's|^TargetEnvironment|X-&|g' \ + usr/share/applications/${PN}.desktop || die +} + +src_install() { + mv * "${D}" || die + dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN} + fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index 5ad4cbb2c203..1137050eed2a 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -4,10 +4,15 @@ DIST vivaldi-2.7.1628.33_p1-i386.deb 60221768 BLAKE2B 448b2ed57f6770fe378deec002 DIST vivaldi-2.8.1664.36_p1-amd64.deb 62602676 BLAKE2B 953ed3741d935cbe6ce3e37e8b7caa7062f1bafdf893cb1e03805ccdddfb4cbeae801175cd562f50e7d2efa273417773bccee7c5d20ac71c138ee40edcddc1e6 SHA512 76da975e24d695765407d23468da0970a224dc3184abe696e4d11125a764c693032e19ee5f644eecccdf468e0be9286d0e89019ef53da4fff4904e7251af6fb2 DIST vivaldi-2.8.1664.36_p1-armhf.deb 55296004 BLAKE2B f3d16c83c398dd817fcc456e0689ef06ffce82d6c937d79bfd563ec4d5e0dc7608445cd0844c6931b53250a3603ae869ae49bfb97d098b45317134db36a1c5c6 SHA512 8c0767ed17b1414bb0a20e7eff0a92a93f2c0d4ee1a2c1f6af3efdafd22bea811bca0473cea477993d0f5fb3c0b493de75f4c173a12d5d4ada8494edda72b701 DIST vivaldi-2.8.1664.36_p1-i386.deb 60890700 BLAKE2B 7a9ec7c4aadd571208e0e212c5fb62433857eb2b2345ef801ddf213fdc73500dc885cc9953cf355ada2e46a8b76199c95f2b9784598e5ea07edea7f8051d8a86 SHA512 5ef2752593960822f2161929637ceec98c5f022d139942c80d36f5bc9ceda67df07c4fbaef7d5de8858ba95c26dae3b4a2677956002e87e405d495b90b9aa5e1 +<<<<<<< HEAD +EBUILD vivaldi-2.7.1628.33_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7 +EBUILD vivaldi-2.8.1664.36_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a +======= DIST vivaldi-2.8.1664.40_p1-amd64.deb 62559932 BLAKE2B 380dbc0a08fa5131ea59460c3aa736f19291ecbec730ebee6b546593c234e052391fda33494952cf778a9804816ee2223634ff6768756345c73b8b55e555e106 SHA512 503f16357a699d9a7c99f05b3536a432bf7fb7c74c9e32a739ba7541a33c8b15d637be7a254fcb64d294815c467ac2569cd05f17f710a145d8e5bf8b8c9ae93d DIST vivaldi-2.8.1664.40_p1-armhf.deb 55160132 BLAKE2B f4776279798f22df6dc6a2478ac7ca758f8ef78ac7260dd1f305cb290a1d22b7f3a97a634a839d3cfa40d10b58892c90d8e57c3982cceccf4877bc7e4c0fe4b6 SHA512 89249be5857c398c8d7f47ddebfe6e278e6f1e12c246c1e623fc16dd702257de1a3140331a8f637e5b1dd53e2ad252b0a9d8c06ade81f8c198687316e6267db0 DIST vivaldi-2.8.1664.40_p1-i386.deb 60896168 BLAKE2B c70a6ca57ad1254917ea8ebdb41d0c3fceb64119c976d82a69aa02466e841dc6715c8b33cf4d1e110c6671ede6e8212dee804c8814e6dcc575e85700fa60490a SHA512 24bb02fb005e7b44798d226e4edbb0e107e38a38000bd8a3144df6c4a6c86705c565994dfee8f9a27b20b1d7a4a3f96dadc93966b6b9c8da76fcafb218a3044f EBUILD vivaldi-2.7.1628.33_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7 EBUILD vivaldi-2.8.1664.36_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a EBUILD vivaldi-2.8.1664.40_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a +>>>>>>> next MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz Binary files differindex 196d83cd60cc..8e1680d967f1 100644 --- a/www-plugins/Manifest.gz +++ b/www-plugins/Manifest.gz diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 61ce24ec139c..7e1439b2193c 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,7 +1,16 @@ +<<<<<<< HEAD +DIST google-chrome-beta_78.0.3904.21-1_amd64.deb 64127558 BLAKE2B 6be143cdfeed71a2af35bb3e899fe274d35ea85c735ed4e8b4ed249c15d06379a496668de060c25c95043e4675dc8e45922ef6de4f9468c837864fd39b1124b3 SHA512 70f86d835b181edfe7a350ccb5b6c7813744cf900521c589e8c45434ec4c5540e2ef21f2b77f169c918f817f921d874b2e70c2502e1b2412f2b89ebfbb7cddce +DIST google-chrome-stable_77.0.3865.90-1_amd64.deb 61065690 BLAKE2B 7a0895b23ab0a09a090485445db794a11168e89730ccff0f2bf3b9415d161c57fa46966df08e70e831de59ba98935c4b673cdfab3aec79f91de95f41ef3797de SHA512 24555110d9638bb090fae97feffb5ff57b1322b101017bc1ac65be67fe5db8508105876cd6b6ea3fcb569d018a79e00511810019b2a36a1a8f59465b30939e5f +DIST google-chrome-unstable_78.0.3904.17-1_amd64.deb 64972850 BLAKE2B 88812fa32376b4dbc85b8dfbd38d30ab592c5eb01c57a4230d451b5855565addeb3b2bfb7e59b7cb622dc24bea67d0ab58db51ba6e38642d54f62f9b9ff3fc4e SHA512 edd2599acea92b73e912b8d8ec95549a29af16c636b6ec38a74ca464dcdbe6e46e63c34a74d0135a4d34fc6c91d3e89eee25d078f0b130b905cac67c1ed4037f +EBUILD chrome-binary-plugins-77.0.3865.90.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb +EBUILD chrome-binary-plugins-78.0.3904.17_alpha.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd +EBUILD chrome-binary-plugins-78.0.3904.21_beta.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd +======= DIST google-chrome-beta_78.0.3904.34-1_amd64.deb 64476112 BLAKE2B c7a97ac3c6035101cc98b15f1df006267e9cd6d6449e35f50832db3df26781a6adf4c38e3ae8bce22673f99a61aed7cbfe26caec6aec84dd1654f4401be2051e SHA512 5fb7bc112d10c0909d9c4cb5e9432bd4fbb4384d29cd509d87f6041ab6dd61ebdb7dbd2526602aef01ae67a05e569a2e884e1cea1c9f298ee9529d4618ea5e3e DIST google-chrome-stable_77.0.3865.90-1_amd64.deb 61065690 BLAKE2B 7a0895b23ab0a09a090485445db794a11168e89730ccff0f2bf3b9415d161c57fa46966df08e70e831de59ba98935c4b673cdfab3aec79f91de95f41ef3797de SHA512 24555110d9638bb090fae97feffb5ff57b1322b101017bc1ac65be67fe5db8508105876cd6b6ea3fcb569d018a79e00511810019b2a36a1a8f59465b30939e5f DIST google-chrome-unstable_79.0.3921.0-1_amd64.deb 65310386 BLAKE2B dbab67768d7fd0fe5fcef6073dbb6ad6891831812e2adf04974ed7820ab01201104889992df4c491a497be2ceda16b858f9b916358b55f3e58b547489c3ee97a SHA512 71c1bd003aa0bc80b477d1b47e33890f26f8c6a8aa2822d4da5f70c736384e884f04be1583daa2b27ecbb21b79d9b16eabceffdf0f98d691f84ec64bbf4fa73a EBUILD chrome-binary-plugins-77.0.3865.90.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb EBUILD chrome-binary-plugins-78.0.3904.34_beta.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd EBUILD chrome-binary-plugins-79.0.3921.0_alpha.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd +>>>>>>> next MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.17_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.17_alpha.ebuild new file mode 100644 index 000000000000..44a588dd47fa --- /dev/null +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.17_alpha.ebuild @@ -0,0 +1,61 @@ +# Copyright 2012-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib unpacker + +DESCRIPTION="Binary plugins from Google Chrome for use in Chromium" +HOMEPAGE="https://www.google.com/chrome" + +case ${PV} in + *_alpha*) + SLOT="unstable" + CHROMEDIR="opt/google/chrome-${SLOT}" + MY_PV=${PV%_alpha}-1 + ;; + *_beta*) + SLOT="beta" + CHROMEDIR="opt/google/chrome-${SLOT}" + MY_PV=${PV%_beta}-1 + ;; + *) + SLOT="stable" + CHROMEDIR="opt/google/chrome" + MY_PV=${PV}-1 + ;; +esac + +MY_PN="google-chrome-${SLOT}" +MY_P="${MY_PN}_${MY_PV}" + +SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" +KEYWORDS="-* ~amd64" + +LICENSE="google-chrome" +RESTRICT="bindist mirror strip" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + !<www-client/chromium-57[widevine(-)] +" + +for x in 0 beta stable unstable; do + if [[ ${SLOT} != ${x} ]]; then + RDEPEND+=" !${CATEGORY}/${PN}:${x}" + fi +done + +S="${WORKDIR}/${CHROMEDIR}" +QA_PREBUILT="*" + +pkg_nofetch() { + eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures." +} + +src_install() { + insinto "/usr/$(get_libdir)/chromium-browser" + doins -r WidevineCdm +} diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.21_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.21_beta.ebuild new file mode 100644 index 000000000000..44a588dd47fa --- /dev/null +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.21_beta.ebuild @@ -0,0 +1,61 @@ +# Copyright 2012-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib unpacker + +DESCRIPTION="Binary plugins from Google Chrome for use in Chromium" +HOMEPAGE="https://www.google.com/chrome" + +case ${PV} in + *_alpha*) + SLOT="unstable" + CHROMEDIR="opt/google/chrome-${SLOT}" + MY_PV=${PV%_alpha}-1 + ;; + *_beta*) + SLOT="beta" + CHROMEDIR="opt/google/chrome-${SLOT}" + MY_PV=${PV%_beta}-1 + ;; + *) + SLOT="stable" + CHROMEDIR="opt/google/chrome" + MY_PV=${PV}-1 + ;; +esac + +MY_PN="google-chrome-${SLOT}" +MY_P="${MY_PN}_${MY_PV}" + +SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" +KEYWORDS="-* ~amd64" + +LICENSE="google-chrome" +RESTRICT="bindist mirror strip" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + !<www-client/chromium-57[widevine(-)] +" + +for x in 0 beta stable unstable; do + if [[ ${SLOT} != ${x} ]]; then + RDEPEND+=" !${CATEGORY}/${PN}:${x}" + fi +done + +S="${WORKDIR}/${CHROMEDIR}" +QA_PREBUILT="*" + +pkg_nofetch() { + eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures." +} + +src_install() { + insinto "/usr/$(get_libdir)/chromium-browser" + doins -r WidevineCdm +} diff --git a/www-plugins/pdfjs/Manifest b/www-plugins/pdfjs/Manifest index 4337b9596446..92036610fc07 100644 --- a/www-plugins/pdfjs/Manifest +++ b/www-plugins/pdfjs/Manifest @@ -1,5 +1,9 @@ DIST pdfjs-1.9.426.zip 3510568 BLAKE2B dbeaa51fea45c6bb0a538e96c39cabb096720aa41d882fe01f0e11ec26d23ead918f4d2c09c9cce37606be9b059abe5902c9eb9ff018755cb2278a55481bc1ec SHA512 4c6a7ac613755a73d694a80ccea0d0d3d100fb0c7039ae5d866059d39e58b650092a733c7bea6d302cfa196f439d28f59055443ab96443161d1770462d8976ef DIST pdfjs-2.1.266.zip 4181305 BLAKE2B 2dd23d90ce660535b7abb8defce0788295e5a35093ec10afcad9d884f82a734c39363ad0607e00a24abf8e688153124d25b0c373d125226a2c8167880dc22bba SHA512 46695b0ebd000c75025fac96088bfe99b3a54f77908735084094759d82384b3348986211d536e8e80ded9a8497498bb1669579dfd9f653746ac5d9a80245a6a4 EBUILD pdfjs-1.9.426.ebuild 470 BLAKE2B dffb9f5f7de94cdfc699cb851dd2fb60ab57de7d4dea089ab16d02482428f6b830a16728b2b911e97995e30d35a1af5ad0a018596757268ad062d17c3a68604d SHA512 6812318355cf55de8a3759db67c6dbe7d763eb83e545522eb80656d9cda7836f6f9f4067c6a95987a0dd988407434663381e5e643fbb85f1c9e223e0a213d288 +<<<<<<< HEAD +MISC metadata.xml 246 BLAKE2B c4ea887d57d4eef8e9e4028e86fa7415ec4e7eeeddf5b5670abb3c2b57d462f46b37edb6032560fbb4b6c27ab05ecc7d4efa339204a41c670d9aa33b6f609212 SHA512 4b51afd80a40f98e559b28c0c2114d61ce0407c682000fe04a54361f0b086829cd8b37efabdec44a88f9e34243810d7aac96fb03f21ac5c16f0ed5427ef0f199 +======= EBUILD pdfjs-2.1.266.ebuild 467 BLAKE2B 004f2d2c25efc7e7eba7c0137704ff8ebb27de34a32cecd658905b346012475d3fadba54fc2f9743139356f8ecfdc33b2089126dd2caaa49ee4983592e51add5 SHA512 0f52aec97ceb2f690ae422cededb5ef004b130efa01bd1aee1021c7dda7c0da4792c5e121fb9812191692b16b90f1ec0606e4d3f22aa58902be3c4a0a694e354 MISC metadata.xml 331 BLAKE2B fc3a794b98cf26bb6266d522c3e691ef1ab71777a3734b6a741daf12fc61d16622e32c53bea01e25fd2cd16e69cb09879265aa3f3ecd23ce8fa0f2be662a3553 SHA512 22fba83c246ffcedf389605f232d0fff0608a46a245c0e0f4a3ff2f010a9a509f4e38bbad681c9030ad3220f63e460dd8965ca1c985ccd6e1c36f0e87eacc0cc +>>>>>>> next diff --git a/www-plugins/pdfjs/metadata.xml b/www-plugins/pdfjs/metadata.xml index e8a87e7193f0..5f7f4b246990 100644 --- a/www-plugins/pdfjs/metadata.xml +++ b/www-plugins/pdfjs/metadata.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> +<<<<<<< HEAD + <!-- maintainer-needed --> +======= <maintainer type="person"> <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> +>>>>>>> next <upstream> <remote-id type="github">mozilla/pdf.js</remote-id> </upstream> diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz Binary files differindex df4ee8415587..e81fd3ee5b08 100644 --- a/x11-base/Manifest.gz +++ b/x11-base/Manifest.gz diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index de371d8f6ba1..4359c49e72ea 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -8,6 +8,11 @@ AUX xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch 3194 BLAKE2B 6ac AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 1724 BLAKE2B 34c607f6b6a6f21ed6b34d7a87cb3bc1774f526f32144218c7d5d338474c08c98c72a87b41f3d0afcaf81dc0e8d5989a48fd8e64a6a9e25ad968ad8156f6e984 SHA512 49d5af904bac03cfc8ad89b70541e9af6687f7f0153d06ada64e2226d27dddc1b7bb27024bed73c20c365197858957730de005c515bbae8e22b610c3241b70e4 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 +<<<<<<< HEAD +EBUILD xorg-server-1.20.5.ebuild 5999 BLAKE2B 8693d6a1ecde9196c4355402b1d5cafbf45bee70364b65560417a6dea5fbfcca360b6980fef8fbc1fe3243743807e061a1b54cf5fbf8963f3cf9930ded6646fe SHA512 fe771c6b82d277db81233d02908e44321c2156380e75d1eeeb9fe806ca58367ec5291bfc04040cbc5019f0e11d94c99ec47562c447ba57aea17f5dd6d3d3eeec +EBUILD xorg-server-9999.ebuild 5727 BLAKE2B c00c01f5b71cc0eb468fb78b45b6c0d8ab5c5393923bdd1ff7fd1daf271f8908d3ab2a62b7cd830a0c04eb88a1d46f13bdfc5d070b9e92f71d031740bcabb8d0 SHA512 d143eef70e356efd82d3a60d02fec9595d58e877a33e19e45ffc7c38ab566e61bf45bf2c8b11c8d998619298b0a15285218bc063e3875cf574cedade52ccc744 +======= EBUILD xorg-server-1.20.5.ebuild 6092 BLAKE2B 8683b99a4044447db0d368591c4e04c76c2cc78d750494b761c7ae875c7c06bb1f96d046cb7bdb9b766c4c249c008c5e8ab2b9053efa7fc168cd727e14102cc7 SHA512 f9158c6f82840dfd12365baa2785039a027281482b21182bd66dd16557e272722d88806c1f27e5efb6a0b64d4c1ad45fb1674574ec64ab3e5567e5563c0467b2 EBUILD xorg-server-9999.ebuild 5821 BLAKE2B d448bb1ce71de106744cb19a3d0e9b9d5ea5e5070f34a01989b4e35843aad5e524838b6b1ee9462ce22168019cc3cb61d049077ea6ba21d2be653db22e72ffea SHA512 23468b0c6d4bd0ffa763e87ae5ba6523ea079beaefe8e19aebb03603ae9e2ef49cf1c9ee58a9e327c95f71b0016f0027ac5a82f4d8ab6f380dbd8bf12a3e6e82 +>>>>>>> next MISC metadata.xml 1017 BLAKE2B 98dc828c96dc8fe30ef9314a6858aab7f25a0959d496f1c61802a38438902597c477ea1ae8018873958339ff936f0093651e4352db2e82fe4b77116365888d9f SHA512 695f5fefa689ccb192e43f9deab082bb4b18f68355d95e6b483e053451c87bb64a4d74c9e382e736e2900b9f4720613651f69831e8eefb2c1cd228b6284ae5c2 diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz Binary files differindex a314c4425efe..6053899c0cee 100644 --- a/x11-drivers/Manifest.gz +++ b/x11-drivers/Manifest.gz diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index abdf416e8eee..5b66c0eaff79 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -16,6 +16,10 @@ DIST NVIDIA-FreeBSD-x86-340.107.tar.gz 60305952 BLAKE2B b634bfd610653f1c546b68e8 DIST NVIDIA-FreeBSD-x86-390.129.tar.gz 64565178 BLAKE2B d21aed3fffec9c0ed8618021594f7719c98928e4d916e1e668c03089beb9dd1deeebd7cdc9a594fee3d3d7f3eff3f6ef2cab7b6f61b25448bccb6e7339e6c025 SHA512 757761386ea57adb3377a8c3aa6aa3f572935bf5fd2b1cd0c66739d3bcb4535d7ae5d55f9e3790dee43e7567c773a8933738aabaf5d912ef6b392c2e7206cfa4 DIST NVIDIA-FreeBSD-x86_64-340.107.tar.gz 61179967 BLAKE2B c12c7c07c090fd7bca78a30082890d0b0330dde07ce9beacdb94fad97d40e9ff9e1413fc36fd94116821137e74076d99a82ab85ecd0a8e16d52b47abeb747802 SHA512 661a4cc79a0adc9a1abebfb3567c26e69628266794b5b539c112112a0989760ea1ea2d8c35a5fe7539b579d4e9cef2685e3e1d12fc7031cd6d1b743c23eadc52 DIST NVIDIA-FreeBSD-x86_64-390.129.tar.gz 63905694 BLAKE2B 7cde21e5b4a63dcf91b103c209222a9715de02e032501ace2bc9897230178a750d523eca4798041f4813b174ab3c7700818a09bdbafe62f217495ce6b4c465e5 SHA512 7485c9807e7d1684e3394a88f1129726fd1c97920e5a033b0c428f8f72daa87c6d210c17fdec0947f786ccaa633e14c8f6b2cc39083087e9989df8621b66918d +<<<<<<< HEAD +DIST NVIDIA-FreeBSD-x86_64-430.40.tar.gz 62712042 BLAKE2B 6791f5931c715888dc76a0e4d2d28deecce24fc7ab989eba6def0369c3f30ccb680dbc792a0a9c3df9194c21286612c9a02f3130e0db53e06a2071f7b3662097 SHA512 a8fd481bafaff2a5aa68a4b1bc57bed80eb794c2d2a35d26546e113610276d0aec79116fb31bd34283da9fae559eef6357e5639baf8a5ced63eb8af6c26fc7bc +======= +>>>>>>> next DIST NVIDIA-FreeBSD-x86_64-430.50.tar.gz 62715888 BLAKE2B 8bb22ccf23054f5dae16f63775492a141ea69c540018a9f4dee358d6cb022d2ab8b7c32acc03f9632d9797b6eeeb6b5e76240b857906db28835240bcf8cede19 SHA512 c028262d67e3962ecce616d68e6d45c0ce8e3d1b38695c18b9b1d08506f848954a59831d99fa414fc09408134d0730e40766d74ac462cf322006b22c14a2124a DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c DIST NVIDIA-Linux-armv7l-gnueabihf-390.129.run 29102893 BLAKE2B 19f73b7ac4df7d0584f180492676eba65a42c527566175308ebb78bd10e0a43c3f300f013193cafc9eccf1cb32a58f8d6dc574073d4197d2d71d90f224e6a5c4 SHA512 9e7a10e0bbd856a7a630fb8d1660a3e5cd224a04243989dbd24f3cc2e869a817a1fabe98b4257e9e5870a96f8d6dbcf51312c960a4a185457cb011ac9a0246fc @@ -23,14 +27,27 @@ DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b7 DIST NVIDIA-Linux-x86-390.129.run 47560033 BLAKE2B e9b34c51d63dada2714c74cdb4ab199a141b1f5dd9f0d3222b1f5eec6a6a07dd2fdc2a609b9d0683b99c26078f4426082ea25b663c47f33fff4bb84599ac41e2 SHA512 b31d8f6b663fa7da1291fc25b4b08e17019476da521baea41201410a1d8a803b8ac9bad18485ff53589cea281ae4ece749118fa23a63e2c0720aafc60367255f DIST NVIDIA-Linux-x86_64-340.107.run 70233686 BLAKE2B 821a2672dcc3b546fbb3f826230fb06741503d75b06f72cb407dd3c9de4f2cbd150bff34e554dca8aa86e7f6bf64ce4f7f9b52976799a477c6c2659aaa5bb4d3 SHA512 51df9370526732db099a8a925d35cdf1317ae2b0ab2c130eaf82373f25186165b4af7d44f71e51e2a68f7d07c7ae3f441a6c6c4be8467003b15dc770c4f4e89b DIST NVIDIA-Linux-x86_64-390.129.run 82314424 BLAKE2B 46e648f413ac2b62dfa02ef63d4fafd87cf71e3c6035435a727a9079a545277efd57865f0a42cd6ea29f74b29955985f0f32e8ade4d5bb0a9cd5de663f2e3f2a SHA512 79e53177f8feb9480215e0bcc6a30896f70e39f55f81879eeb4539492c01ce55471d27ccb9af49040b96946836d387ff8c71d25d06f6b13bdb626b44ac7d4777 +<<<<<<< HEAD +DIST NVIDIA-Linux-x86_64-430.40.run 111258448 BLAKE2B 9782181d5044430b374305fc868dd753d0f27c3b2f1f6b4bd34b3a49226730c4cf34b1ea4f3ba2c4fce5739c0408c64cc79f1a2c5a312ff3e09a5d20a79ce625 SHA512 68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b +======= +>>>>>>> next DIST NVIDIA-Linux-x86_64-430.50.run 110545029 BLAKE2B 01c87f7b1b71146e04d1310431227d125904e0475c7e9656fa2aea598b95952fed083024277607a5a06c6c6bf93df4e0a89051cf887f28c902c3d409c98fa807 SHA512 ccc70fc717e53365e340bc210d8817939eb2d798608190144a9a1d690d04eb140f0d01a85a427bf2223b6d12848177e2ab94cdb3902f5117950638dc1ef28fa2 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776 DIST nvidia-settings-390.129.tar.bz2 1109456 BLAKE2B cdce0bba52697e214ea26514467ea6f61fa06429f0a58ca549b74d8da1f7b07cbc52b1c9de6a13aed77545c2ba8c98b212a7865fdc5026dcd74f5565b73c4e1e SHA512 bf004608fbee6a12521fbcd9ab4e3d0333896b320c943ed9f2dc5373d8ffb2eb9cb4c6873a263acac87a9ab67a5f4589344d2bbd70bce36cf14242f4d57e1b87 +<<<<<<< HEAD +DIST nvidia-settings-430.40.tar.bz2 1131627 BLAKE2B da55a08d3a4d096afe5aec5fc7faf36b10d814cf135a444f06a115b225d94fe20046a266e6afee3660b588561c4fadb1581e6f9ab9196fe19eb171140f05ba9c SHA512 9273887c2487476fc004839320b66726a766b0378dfd81d030386918d67e6a25ec6b26bed1db5c07634347e8cd6782f826c75e9ba8977b06e37880e4b55a1b9f +======= +>>>>>>> next DIST nvidia-settings-430.50.tar.bz2 1132111 BLAKE2B 3b95957f8737ebefb14d01db03929835dc0b58ba4c539f153a5d0278bf11f3b10b189cd529f7e65fac339a2660c2aac1df16e79b61bd13749ffdd0a17db6792f SHA512 02dd870021333825da8eff3b27c3414a8c4f6e0af14a07ffe1616466e80338daf33d6085d23690d71898b2219ca0f83ebbabbe176b40909ac7556b8a0184eaf1 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb EBUILD nvidia-drivers-340.107-r1.ebuild 14337 BLAKE2B 9d69d838adcbb2bcc20d69ae60156cb99baa4b5030c9f895def311f561b1fe8066936aa9d4fe7863e55077fdc00a7d136e51c463edb4472431e15d046f77f118 SHA512 ff1bd377e6eef99415eb245a1027ad6c2645edaa8a341305884147d36a7d0347c40baa5053bb807237d28c6ce25d8d130f3f00e062333f3c1397e97ccf8cc46c EBUILD nvidia-drivers-390.129.ebuild 16279 BLAKE2B da4b18fb4d5b176e1f05b657f84630061ca4464d6722cee61cf4dc2714278e69c70f41c072c927eef48170957c8de3de086cf314bac83db64b1669658c7c6c50 SHA512 465df3c846024ed3a54d2d93d0189ba249ced3611479bf4b8b2ee3693887a9c00c247874e7aad61894ec7479d89e0877d6008c9e5cababbe367be1586ba3a7d7 +<<<<<<< HEAD +EBUILD nvidia-drivers-430.40.ebuild 15841 BLAKE2B 1b18946c96999a975c1356f14b14be1c89b92ef218291553fe893fbc84eba4c8e3faf739f291a06433adbd0fbbe0a0957d1d46bbd265b5a53486a03fc1ffc332 SHA512 092c0b41af44315f149074c089c660b022a7851c7bab17add8aeb588da6e9e4fb975fe6e60554c8c3fce3bf0e9eab6bbcc675c35463ec939a0717f0b5867f9b7 +EBUILD nvidia-drivers-430.50.ebuild 15842 BLAKE2B 45fc74905d0e757ca6d631bb748576941cd2d2d91e5e9653d8092b911a7a5b54ebae52db87215eed6d2159af8092ff15db28f16b450e9d1a008eabdea4994a2d SHA512 5da8a3ed34a9cbf73f70a50dc3db20e329ce970d9a1e4c569bf81fd94f215bc8ced14aa404f6296209880f98ac15c2878db89284f1e467e3c171486658d7ce94 +======= EBUILD nvidia-drivers-430.50.ebuild 15841 BLAKE2B d5c9a30a84e3c183625e84ebb08efe2f251af843171f63acf69cb097a2fc64479f5adee7639c0331c7813fe1483e44e1edb114fa13a2d9aa016257f2566df743 SHA512 1d05a9f257aa8f04e8965189d6b5e0cff743fefde7516dd775009048adeda8bf50a7f8144a9e611b203333c693f797012b4977c454f879d2d2340664b50fd283 +>>>>>>> next EBUILD nvidia-drivers-435.21.ebuild 16199 BLAKE2B 522a60cf101b0f9f6b41674fce0402e7d29dd64439ee3b28e5fabf7b67426ee14f6e95c328c09b7a16b0510fe4edaeabc9de83edd98dde88708e919c7d90ad0e SHA512 2d152d463af1e0a1629969cd502f534fa789b86d51516986ee4661926521db7028fa63f5b9ab8e7bef858ffc38da8511c8e5c0d933015e3001a6c89b60a5282e MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020 diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz Binary files differindex fe9ac266a090..1473ab64c455 100644 --- a/x11-libs/Manifest.gz +++ b/x11-libs/Manifest.gz diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest index 48538b504d35..3c59e5b80be6 100644 --- a/x11-libs/libXvMC/Manifest +++ b/x11-libs/libXvMC/Manifest @@ -1,5 +1,9 @@ DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 EBUILD libXvMC-1.0.11.ebuild 561 BLAKE2B c953baaf4ad3a58c66d04548d61cf43f2b4c21a78dcd326e08ef3784c8a860de9c2a80e9aaee205afaf6ce6a8910e7c4bbbcbe9392e1405e193afa86bdf8a366 SHA512 ceb481b9ed6f856150da175cebe9a1142279e0ee95faac19d0ab7485df090ee421a16a64e309b4ae16e1a1c830a9909ac9ce58619a5e0654c50b96687b90c148 +<<<<<<< HEAD +EBUILD libXvMC-1.0.12.ebuild 572 BLAKE2B 55ea00c93304e27424d491951048c6b1f1ccdec48debef77f16f04e3bda4ec1a92df69f74339256acc0abe790b7dfc517675fcd6874c895c5835d12d00fa1c2d SHA512 6eb785778d93e81b398d207215a52a1159a589f91e79b591ef2068db5fbd42586d705eca7b7facf4ae9e6846216135fb5a57ff9128d0d8a7a51205ac1f8bf0ff +======= EBUILD libXvMC-1.0.12.ebuild 602 BLAKE2B 69cc678431a16a42c4def165c4fdade82a46c5a96dcc4e93e2a6e7b9a7ed130c04a64c8dc99446c73cac5c65c0c363330f790abca1bbd6a944083ebec579d0b4 SHA512 7e769d6b7341c1bf300d7be28c0254ed8b09063b76d91f73eb6c220a8d045fbfc3c90d3c96cc36d64fd9659482d089213ecfefcf36157d6e5c4fedbf43320733 +>>>>>>> next MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild index 7b097fee4de8..d3db40e39822 100644 --- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild +++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild @@ -14,8 +14,12 @@ IUSE="" RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] +<<<<<<< HEAD + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]" +======= >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] !<x11-base/xorg-proto-2019.2" +>>>>>>> next DEPEND="${RDEPEND} x11-base/xorg-proto" PDEPEND="app-eselect/eselect-xvmc" diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz Binary files differindex a033f1113ee8..1781b5f9bfc2 100644 --- a/x11-terms/Manifest.gz +++ b/x11-terms/Manifest.gz diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz Binary files differindex 68ee18073a4e..ddb18bc7daa0 100644 --- a/x11-themes/Manifest.gz +++ b/x11-themes/Manifest.gz diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 3991ff471792..a7a70ea039e5 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index e140a8aa7768..6703d2d3b0c6 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -5,5 +5,8 @@ DIST enlightenment-0.23.0.tar.xz 26425732 BLAKE2B 2b0bd2f27f5589eb4fa9e1cdd0f271 DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb EBUILD enlightenment-0.23.0.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f +<<<<<<< HEAD +======= EBUILD enlightenment-0.23.1.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f +>>>>>>> next MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b |