diff options
Diffstat (limited to 'metadata/md5-cache/sys-devel')
19 files changed, 82 insertions, 0 deletions
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 |