diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-24 10:19:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-24 10:19:03 +0000 |
| commit | b279bbe94522565b8feb19b8e5f377d3ea76f157 (patch) | |
| tree | e4790abc54cd850232f7d7de49e371fdfe8976c7 /sys-libs | |
| parent | c5283d322accc6097afec74eab24550829788bab (diff) | |
gentoo resync : 24.03.2018
Diffstat (limited to 'sys-libs')
20 files changed, 100 insertions, 100 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex f7c88ccf957c..74db94474422 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index 3bd1bcc6eb71..b120a8c6856a 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -5,9 +5,9 @@ DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c8357076 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c -EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4548 BLAKE2B 92ab6b7854a5d8bfc5da3160e6d1bcaa4347ae4faa5ac4ad095902b61051a1b89afd74e6c7827958184ff9d5668efa226344bf0e631a8c85542e48ea6cfd659e SHA512 0f4f9b0497b17f0fabaa74c83ff946ffe55b828fc286c4e82ade53e54b10491f92bef91d06567d9d7e5dc50ea150f2b0ed5484ff599b01892428966ea630e121 -EBUILD compiler-rt-sanitizers-5.0.1.ebuild 4846 BLAKE2B b7723034964cf81192ac1d232ec35c099c5755d38fe7ed52b24413075fe1c4915015e69b0efb62dc4d84bfc0f64d1f9ff1ca7f6f7bf70d32e7f121e316382ac1 SHA512 1ee73ca6024f753ec05ff3bae518abf15587cd991c5917bb462ec5e87d27ad49038c572f6b936c3fd06410e8ae428c1b97d9c49b21804f26d09a180a1937bf81 -EBUILD compiler-rt-sanitizers-6.0.0.ebuild 5046 BLAKE2B 2f98d0b4e136b478d831a45632693f19f0e8c8dde47772d258180e8d868bab3950430fdf671584adc4feaa45055e3f32ca435afc94d4c7f9045f3b5800ecd92e SHA512 d4f6d2a8552100029a29b2e7a94bb017c4914da314bba8118c3610513c6dc53173af30bc50555cb12a47da15222e97d796bb1e03e8c0497dc45f5f10f4654d17 -EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4996 BLAKE2B d52e5a1144f4699793fe459521f1192c2ca2f0f469e3c9992f7b04eec3352f63b448ea98c552e55c2c2e868dc09d5d30cbd4be737d7d8eaaf0b837b7b67c6df8 SHA512 6259320ff164c440e120a755e4bb65b07c196fb0f40ddbcbaf860c17838f0c42e9ec7ad6c9f5ae8aa66fc29712a4bafc98c7bfca33c3add8aa0d4ca4b4ce53d4 -EBUILD compiler-rt-sanitizers-9999.ebuild 4971 BLAKE2B e2fe4f691f01c37c73ca93864d358d1091f976b69ae3c84f96ec8e50a7a584a4ec468f3e9127ee02be1ee0192b0cac54499951d53ee82f1177fa60a23b8f3017 SHA512 e8586923d94c8105a8b896365dbe4e7379a04277d0849aa1d16ab6099b7c5f6a9841a680e72ac2487386fb967fc84d4e6d8d049a4b01cbe0945f1eaf20bf4faf +EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4512 BLAKE2B 4398fb881d8fe73b7ccdc37f733c9e221b84be6c32ff015e2be285fc9b14d371ca4d3587e2691b68b128f5df6617d265a21442e2bcc9f631d76f8efbe7313c3e SHA512 c7c74c9ee92e2e85973bdde728d6f2ca9ae8e3fe990b975290fa31ca085a36ea1eca0a4fbd4118c62372af8bd3f2f6a2107c7b884300f30202bca013b4d9e21a +EBUILD compiler-rt-sanitizers-5.0.1.ebuild 4810 BLAKE2B 2145a3ecac6a17a5ccce7ecf819d61ce23b24c21118e2320ced34e2c7ceb54bd4194fe9194cb685275ab2f8804a7f9d7624800ff0260ac821c14887787e73659 SHA512 7a14dafba5fd7919c0f1f2a692f2a6f66553655bf238be18017de5be91a416f512426210bac166ae36a80557b277bdb1e12ba8198cb3a8b0db6b3519cf59e4cf +EBUILD compiler-rt-sanitizers-6.0.0.ebuild 5010 BLAKE2B ed42f30c2bb225f949ae4fbb5e1cf17feace321101ea52d46eace6ce77e3d33daf59bef5c7e65e6b0a4aba5c51254a6673b8df909b792a4b25dc1b13c616c1b6 SHA512 2831e0d85ec4c9861da756c5816de481a978efb704fb2223dba078033eae0f65fec2f912d1557481b3449cabc7c62e4e88e2031500136d32cf4bba93b445b7a2 +EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4960 BLAKE2B d2d1003d38f235d793df9d22a6f73bdc143fd914dec37026699820ff7ece486a55ba8bfa372b9d0045cc193ef691a40648cb5eb8b254ecf0e1e13ba7057556b7 SHA512 b946abeb441caa9ff6bd67210313384dc2ee7ee37c3bd1c8b6fef7db375388c12901c3552d400be401281284d25ba11b405e1894f938c084669005fcc9b01098 +EBUILD compiler-rt-sanitizers-9999.ebuild 4935 BLAKE2B 92426b7c2e68887ad859fdf773f0ac601cb7e15df506ab590e106f26ea729721d0425fab4326d14936ef8a21bfd0d8889fa5b6706e1f44f60ce0107f565c826a SHA512 942b386808a78e1f5bb701daff9e590a0b16cd477fa014456f0f6b41cc45a682e71d2f2c15e05cc282c6fec011a260e22ba642cd8ffc9f86ebed1332432c5f8e MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild index 632e36150ded..2dc0d7cb40bd 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild @@ -21,7 +21,7 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86" IUSE="+clang test" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} RDEPEND="!=sys-libs/compiler-rt-sanitizers-${SLOT}*:0" # llvm-4 needed for --cmakedir DEPEND=" @@ -30,7 +30,7 @@ DEPEND=" test? ( app-portage/unsandbox $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -111,14 +111,14 @@ src_configure() { -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -131,17 +131,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild index db4e4d049b52..b09a0573d92a 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild @@ -23,7 +23,7 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="+clang test elibc_glibc" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-4 needed for --cmakedir DEPEND=" >=sys-devel/llvm-4 @@ -31,7 +31,7 @@ DEPEND=" test? ( app-portage/unsandbox $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -115,14 +115,14 @@ src_configure() { -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -142,17 +142,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild index ca7cb14d19fc..cb0a84d01c62 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild @@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86 IUSE="+clang test elibc_glibc" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 @@ -33,7 +33,7 @@ DEPEND=" test? ( !<sys-apps/sandbox-2.13 $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -116,14 +116,14 @@ src_configure() { -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -143,17 +143,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild index 52cda5eedce6..c9bd5cbb5820 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild @@ -25,7 +25,7 @@ KEYWORDS="" IUSE="+clang test elibc_glibc" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 @@ -33,7 +33,7 @@ DEPEND=" test? ( !<sys-apps/sandbox-2.13 $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -117,14 +117,14 @@ src_configure() { -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -144,17 +144,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild index b232680519be..8b127c7f41aa 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild @@ -24,7 +24,7 @@ KEYWORDS="" IUSE="+clang test elibc_glibc" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 @@ -32,7 +32,7 @@ DEPEND=" test? ( !<sys-apps/sandbox-2.13 $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -116,14 +116,14 @@ src_configure() { -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -143,17 +143,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest index e0bd559e2aa7..dc5647818cb0 100644 --- a/sys-libs/compiler-rt/Manifest +++ b/sys-libs/compiler-rt/Manifest @@ -1,9 +1,9 @@ DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649 DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4 DIST compiler-rt-6.0.0.src.tar.xz 1633096 BLAKE2B d5df9b16ad474f687507013fb6eda8c7c3bbe479c85aab6ce428b93bbef2467538c0ba59c54dd9266b978da53c8c312a59e3b7abac843702048900f5cdbc1011 SHA512 717bed116ef43ebb2e18daf6fb737472edf57564947f53fe6368d3bbb080f63e986c0d1b94dbd087be998196ad7be54f4361854f8eb5214600b82449ba02c9c1 -EBUILD compiler-rt-4.0.1.ebuild 4162 BLAKE2B 90782fd51fa867ee5cb1240542f8acf16c33dbb7cb4333ecf2ed126478f346e89c3c4134e27a28b4c7cc3e9fe71da1bc8f95ab49d644d0b6dba63aac84e5b4be SHA512 1a39910b54c6a186eb166e7910c36eff900264bd00e44d59d8d0bdeaf1eab8a58410a4256e330c8a78e059bb625f53eeaab43682c83c62a806816183ea13c327 -EBUILD compiler-rt-5.0.1.ebuild 2681 BLAKE2B b844ebb03e217337ed4f90ffee3cbf15a17a84ff3c36fc497638d69aa1df07b79121703c1073f52d63d603db4f9613872db99357a7ae3c927a177431b4a3cebb SHA512 53fe8df8b014180aaa6d2025d9cf371c5f2cc473df75125ecc9df02fac2b92b0ea029b445c169144d0677232cffb1c6469ed16d01683c03a7aeb4af71658ca1a -EBUILD compiler-rt-6.0.0.ebuild 2919 BLAKE2B 3d1d622e4c400275846f9820da1c981ba06253a93e0634861e5a0e7eaf099417488da5c15c8273aac444677b86a10f0dc58389f6db9be07c24b1e6abaa61586f SHA512 c7b48ac9ecb64602d7136e552c84632e9df395488bb6dd1ad6d0dd801ed085e39ec22db12f92bcc85f7c4713c675ce48f543fd326c75f798bade5b677cc10e33 -EBUILD compiler-rt-6.0.9999.ebuild 2961 BLAKE2B cb7a3df71a01f4ab55bebdca51bf2651480108e1b91761416d6e9ce90df44ac541595e9463624fe452ff5b5bbf337be08ecb0367e0cd898f224d3eed58734a53 SHA512 f1d8b8f3417c5940e70f05b7e6537572d41ae10c156fbaa7c1c1ef32c679fc548297e5551860929dd9a53a6e4e05b9a18dc44985a8be7bbf16289bf42745d774 -EBUILD compiler-rt-9999.ebuild 2936 BLAKE2B 0aed5b19e2678a3cc2c320fd1264d29e87671b694e40c3eddcc220c73a312cd2f4b9b5298b9eccb1a880808241b3751a5297ef8aae7975df6ecca8dac8629d6b SHA512 ef54f839c69ff25aa92de03761294ecac872c8831f4e09ea9cc188c2cc8b2ff7519dfb6593a8ac804cd059f0733fdef6266338e46adb7d9d0210e6b7c310c15b +EBUILD compiler-rt-4.0.1.ebuild 4144 BLAKE2B a89fa2681b1254b285aeab803103860efddb6990b33bbe725fe52f7ebba5652f4ba9ecebbced1f63adc84dac4dc7dd26b10a6e7863169bc08f8e95cc2ba868fa SHA512 f14a4a61cc42a37d62e6662aeb95c8d2c3534b0ffbee57cf788ce1df62ab1387af76e90a2d79708c50b8b70d073b00298b0d31c71e8d69e11f2e9204dcbaca4e +EBUILD compiler-rt-5.0.1.ebuild 2669 BLAKE2B ef51a5cdb2a5990676a8fa8d8f48fcd9b289cbb83f85cf232fc5312d9d8247fbf418d5f325cef190c65bc4237fa1e04e3ced0139c3a90fe874ceea9a32a1ece1 SHA512 cd72debd35894e5267ec2f6dc27acf091ef06e0d11fac9f298e259c993653f1161e7c54d2c654b394b1abb02153f0b27d381b4db5cf0fc593b6000121b2d063e +EBUILD compiler-rt-6.0.0.ebuild 2907 BLAKE2B 53a1f886d5df143d35c754521eef1112eda7a7ec0ca9492b6b42276190f6451da2d27bb2866942dae75277abe689d3a8a4666304bc881b679978d32510105854 SHA512 83851e748f9d7e8102143844aa6714d5ed18fff6fe6448c68b8994107982f112d70681df6c4d82ee750fdb48ff68743caf6ac3b2938ec913ae9ff97896b5fe04 +EBUILD compiler-rt-6.0.9999.ebuild 2949 BLAKE2B e89fc5abd2ea4c5fae4b40b69f0c9e6bf7a673536d42f892cec268a65daf797c0b01f3223858e80b72954e74cb842ff73267b6740e571fb68109b9d7e3418480 SHA512 fba6b9f13f85d2f8a7855f0c5330b9032efb723d945e2102797c3c3ef67fdf379cea379b7241cb8569f3e4d0ab22a5f93f1258923fdcac334094591cff8a0e6d +EBUILD compiler-rt-9999.ebuild 2924 BLAKE2B f5f2739f3c8d70d0464334862f21c50ab1266cbd5b96c0f9a10cc0d1014e87b6246f8d3f3fe139d6dbca9e22c87f72ec6c93f56656fde6977d7a7704c0f81acb SHA512 c14a2dd7c4a5ed8605403fd404de33d45b51432f54d7f9a3a54a3826cff36840ff3d64447c2b0617b24047f7d6c56c4263874a1606e64555cf21d32ad01e0b12 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild index f7a4ef2ed66f..bb00a9d93c61 100644 --- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild @@ -20,13 +20,13 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86" IUSE="+clang test" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} RDEPEND="!=sys-libs/compiler-rt-${SLOT}*:0" # llvm-4 needed for --cmakedir DEPEND=" >=sys-devel/llvm-4 clang? ( sys-devel/clang ) - test? ( =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) + test? ( =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) ${PYTHON_DEPS}" S=${WORKDIR}/${P/_/}.src @@ -88,9 +88,9 @@ src_test() { # prepare a test compiler # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}/usr/lib/clang/${SLOT}/include"/*.h \ "${BUILD_DIR}/lib/clang/${SLOT}/include/" || die @@ -128,7 +128,7 @@ src_test() { einfo "Running tests for ABI=${ABI}" # use -k to run all tests even if some fail emake -k \ - CC="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" \ + CC="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" \ CFLAGS="$(get_abi_CFLAGS)" \ CPPFLAGS='-I../../../lib/builtins' \ LDFLAGS='-rtlib=compiler-rt' \ diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild index 241fc11bd3ac..b4861d13427b 100644 --- a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild @@ -19,14 +19,14 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="+clang test" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-4 needed for --cmakedir DEPEND=" >=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) ${PYTHON_DEPS}" S=${WORKDIR}/${P/_/}.src @@ -88,8 +88,8 @@ src_configure() { mycmakeargs+=( -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild index 44dd01ced40a..5292e752c063 100644 --- a/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-6.0.0.ebuild @@ -21,14 +21,14 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86 IUSE="+clang test" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) ${PYTHON_DEPS}" S=${WORKDIR}/${P/_/}.src @@ -93,8 +93,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild index 2542708841ae..74f0dac70c66 100644 --- a/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-6.0.9999.ebuild @@ -25,14 +25,14 @@ KEYWORDS="" IUSE="+clang test" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) ${PYTHON_DEPS}" # least intrusive of all @@ -95,8 +95,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild index b6a339768aa1..7a956b544dfa 100644 --- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild @@ -24,14 +24,14 @@ KEYWORDS="" IUSE="+clang test" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) ${PYTHON_DEPS}" # least intrusive of all @@ -94,8 +94,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" ) fi diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index d8b752026586..e8f77553bb8b 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -2,6 +2,6 @@ DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4 DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3 DIST libblockdev-2.16-1.tar.gz 282247 BLAKE2B 0645ffe9f0cadc6e412de813b32f4e37ead67039a69f7e8938b41f5ea10983a18d31e29653eab50dc41889952b00658b91853908dff3e62b50c1e85a267b4a63 SHA512 d48d4b0e3174ad7b93558534d7f0285b398e47e2c9dce3cc60cbe0a32a78fef32601cca2508f30a882609ceb3cc59efe2761720af191e6394ca1b8c51878b535 EBUILD libblockdev-2.14-r1.ebuild 1504 BLAKE2B 8da60dc425c0b83f6e75705815bc94275937bd1c1d5ace0798c850d04d561910a1f7086f32d131b7aaf0d785cbacfc9179909d0e8909646524f34638a38ae399 SHA512 6e19060b01e9b21f1969d35cfff4a58c20456d4594f22ec4e8ae961480302abb639816f97212956e067b0df921ed17d8c1298ef025598c56aab663cb430e0ad9 -EBUILD libblockdev-2.15-r1.ebuild 1511 BLAKE2B 4dec54efab145e4b97faf0fabb0a98bde71ea31aae72ab6baa2e4fc70b046fe423bbdb1e3b95be911cf7b0d93b8f88529261b5819ec734e1aa1a1f402a2914e6 SHA512 9706152e06aba541beab82f1c3b20fa412cc96de67ebcaf3373eb6d071d8de40067c58136b1b32140ebcb6581c285f6fcbf1e6c2c0594687217a0d944612b058 -EBUILD libblockdev-2.16.ebuild 1511 BLAKE2B 4dec54efab145e4b97faf0fabb0a98bde71ea31aae72ab6baa2e4fc70b046fe423bbdb1e3b95be911cf7b0d93b8f88529261b5819ec734e1aa1a1f402a2914e6 SHA512 9706152e06aba541beab82f1c3b20fa412cc96de67ebcaf3373eb6d071d8de40067c58136b1b32140ebcb6581c285f6fcbf1e6c2c0594687217a0d944612b058 +EBUILD libblockdev-2.15-r1.ebuild 1502 BLAKE2B cb40718f826b061ec21624de515eaa213b84f358d98105370a37db5b7065083b14bee73ca8331faf50fd8bbe20284e9bcdaafca44554af510a833425201d0d04 SHA512 413343fcde87c99dddad2301b2cd70c18c986412d605b4105b19cc3e714e0a367132e33a9b5f08ece8884984c0dfc88f304eed2d208c057099b6d940e069fa9c +EBUILD libblockdev-2.16.ebuild 1502 BLAKE2B cb40718f826b061ec21624de515eaa213b84f358d98105370a37db5b7065083b14bee73ca8331faf50fd8bbe20284e9bcdaafca44554af510a833425201d0d04 SHA512 413343fcde87c99dddad2301b2cd70c18c986412d605b4105b19cc3e714e0a367132e33a9b5f08ece8884984c0dfc88f304eed2d208c057099b6d940e069fa9c MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436 diff --git a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild index 5a0a5ca95e87..11885ae1c964 100644 --- a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild @@ -20,6 +20,7 @@ IUSE="bcache +cryptsetup dmraid doc lvm kbd test" CDEPEND=" >=dev-libs/glib-2.42.2 dev-libs/libbytesize + >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( @@ -35,7 +36,6 @@ CDEPEND=" sys-fs/lvm2 virtual/udev ) - kbd? ( >=sys-apps/kmod-19 ) ${PYTHON_DEPS} " diff --git a/sys-libs/libblockdev/libblockdev-2.16.ebuild b/sys-libs/libblockdev/libblockdev-2.16.ebuild index 5a0a5ca95e87..11885ae1c964 100644 --- a/sys-libs/libblockdev/libblockdev-2.16.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.16.ebuild @@ -20,6 +20,7 @@ IUSE="bcache +cryptsetup dmraid doc lvm kbd test" CDEPEND=" >=dev-libs/glib-2.42.2 dev-libs/libbytesize + >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( @@ -35,7 +36,6 @@ CDEPEND=" sys-fs/lvm2 virtual/udev ) - kbd? ( >=sys-apps/kmod-19 ) ${PYTHON_DEPS} " diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 3cd8bf33822c..b3be5a7933d8 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -16,5 +16,5 @@ DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f6249 EBUILD ncurses-5.9-r101.ebuild 5283 BLAKE2B 2860fee40555ddc883b4ffffc8ea1055c4c5151b451b8a25226fbed116d37e3862a6c9c885666365882bea428fff71417811b5ba04aa72ae0df6ed6bb3afbeaa SHA512 dce58899c1ca8b1ba1206fcbc015821e5de433b8ca4f750889d9281e35c15e70bd2628f4ef3a9990d7f1c8d6a757368833d9c88587eff6e480465697ac29d6f3 EBUILD ncurses-6.0-r1.ebuild 8633 BLAKE2B b177892af3da61b6f3d2e276a3545de911ae0dbe123797807b63d45fb912b4b0333b487fe52827abe1154332902f9f111b65890fbb4063c691c6aba356a30062 SHA512 00585f364321576bca9f55f49ffa4f7983c8293fc3db1103f7f045d5de6618e88a68255e6c3f383098143b568e49cacedc9a27a4bf7504df69a1afb49b0bf5a8 EBUILD ncurses-6.0-r2.ebuild 8766 BLAKE2B e8ca8e1bc7f67c21a1ee1515db347613b104fac7b57564d3862e6b2473c373c306e573277b911f355632d8d0b8abaf3aaae96c882a8b359d375cb4b9cc3824a0 SHA512 09ead9efc080da50fa5efd4405ef199ac7f2206415342663e0fed15361a59c5bc0d6b6ff604e49b857897fad1eb3ee621d3e3a7ae61cdaaaf32dcb9a32952fb2 -EBUILD ncurses-6.1-r1.ebuild 8505 BLAKE2B 5330f9fb2d1d70db510ecae0f6b3665d9e103561954493ffb2d27ac349a8526edef086243780bb321222ce00e312797597d4dd8ad1594a250c1e1c160cecd953 SHA512 30039fb4482cc65dd08b4fe848f1fe524cce73876fc8e1aaaf0e7a2faba626e4b49c3b3ee328231e80038d70443949eb98f472c95192389fdf4dcbe01862b227 +EBUILD ncurses-6.1-r1.ebuild 8504 BLAKE2B a981140040c6bf35ec65d4e51f3779864d59e44e1f4d6155d3260e5fd88bb3855b8ad99cf84afc57a4e88c3b7d3f3fc65565979ffdc64eb090954c49b4019838 SHA512 6bd925ff1bde1816a22aae320d745202e299be16c08418d1d132949ba27f1551eb3370acb9b889d640966b1bf3a00dc5ecdeb6e219b126bcc0502aa1a5b8e782 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef diff --git a/sys-libs/ncurses/ncurses-6.1-r1.ebuild b/sys-libs/ncurses/ncurses-6.1-r1.ebuild index fffbdd92da9b..cbdc9b1d84a5 100644 --- a/sys-libs/ncurses/ncurses-6.1-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -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" IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest index 75a1e36d93f2..6c74a162adbb 100644 --- a/sys-libs/slang/Manifest +++ b/sys-libs/slang/Manifest @@ -6,5 +6,5 @@ DIST slang-2.3.1a.tar.bz2 1577749 BLAKE2B e3149502a7d6e6d13800f3d3df6e56f176da08 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5 EBUILD slang-2.3.0.ebuild 2266 BLAKE2B a94234aff5114d0615cb99c594542bef50ee738bd59a6b6ccb864ebcc243774296f04351b45e80d045c90b68c638fdc3b85860b5670ccb01a0477ca8a14c0e14 SHA512 3a9544b8fdcb2d2faa4a3becd0dc60402886f677180d87d5148ed857a25cfad6ed62eb49a334b287ba36fc10ae5362d01dbcda482526e9c4f92ce430eed85661 EBUILD slang-2.3.1a.ebuild 2264 BLAKE2B 54a95855948ad64c5dc9f630641ad669f879c3acf0a7e2ff15121aaaf4564878619e45ad2205a6b2d52a7a1b90262b6e13d074bfddc65e7a55c0d37a31c62c77 SHA512 409f754626c1384bca2fafd3ee96c51985968be22a2bb0076650adb1c069dc0e9a13cb6a2420f871ddacf4ac40ac81b852a107dbc524aa017c0f932b87a983fd -EBUILD slang-2.3.2.ebuild 2296 BLAKE2B f6c22842d0a5824755f2b254bf463ad89b4cd0da748f490f887ae519515f240a6931b02497e1705b01fbdd5d75eb45a5644aa7bfe015c594fdbd938e72e0b09e SHA512 05a689115ccec6f041e92a6ed4509ea89a63f3788dae60a005cea5dfca21cf7ff290c8d6834a8268ed48d7cd5359c65891b6ce7afab08cc93e123ade3bacf5b5 +EBUILD slang-2.3.2.ebuild 2295 BLAKE2B b58ef35edd4b43d6d0ffb76fb0888826c72e5e0c9dc9b079ec3ec4afd35a0294c5f710e51eb75cfa9a40e6a3537ddc6a6a2507c4cafe94b61534206da711f160 SHA512 b4843d3314873b2f431a896653954ffc05d850a5e76d2f4fc1d1e70bcd0a29b22c63e19a981a8ee4d79d6234bb74b4b6eed1241256b83d6412220f89b25510a9 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441 diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild index b8bca916348a..c7726ba7f80f 100644 --- a/sys-libs/slang/slang-2.3.2.ebuild +++ b/sys-libs/slang/slang-2.3.2.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" = *_pre* ]] ; then else SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2 http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2" - 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 ~sparc-solaris ~sparc64-solaris ~x86-solaris" + 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 ~sparc-solaris ~sparc64-solaris ~x86-solaris" fi LICENSE="GPL-2" SLOT="0" |