diff options
Diffstat (limited to 'sys-libs')
70 files changed, 952 insertions, 1620 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex d55007ccb0bf..1cc24d6e3e1a 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 d287f17e6e7f..5bbed7d9cb89 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -1,16 +1,13 @@ -DIST llvm-gentoo-patchset-10.0.1-4.tar.xz 10472 BLAKE2B be17f25c8e1ba102c7653ccd3890be2da18566d051dcc35eeccf738d0cdfd4c98fed1c9e3d8fada0a394acda4568d4579534255e9706912581070d3cbdb2140a SHA512 794cb77c3002b398a2fcd5f845a41f9d075ba5db53d13665c64958ec809a181ef95d054a0850e49066ef1e926e326077f4305e088ee29f30acf9c2e98161be15 DIST llvm-gentoo-patchset-11.1.0-3.tar.xz 5984 BLAKE2B 89056fb8e82c7a29ae76c643ac631876d51391ffb579324aaf13c7f79e03f6fd8bbcb27d46e57e0f04a702602ebf51c116e82cb092452a1dbc97fb0eb7518f11 SHA512 08aabe8836b62ecfde4e264d567169ba495d5b5915b56aba35ae86992387e534bba6d512fde94056e641abe909b478e47edcbdaa3ee0b94182ecd68c98201441 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 -EBUILD compiler-rt-sanitizers-10.0.1-r1.ebuild 4513 BLAKE2B daa067db497d6548d10041d7a2e99aca314c0b8c136e045d799f1205df135c04af2bce717e0fa281b67a6ef6bbf95fad014d1ae354eada02b2c79884af8e7576 SHA512 3579b322368ca2f350d2d373f6addc871aa8046d80dfead13d90a6564f288f35244bd5957b96d743356af7aa9560e3ca8ebb5863eea7c835fd8648e8b0fb4d8e -EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6036 BLAKE2B 30bbe8f96289a6a4e66367728d74c3cd4631a11273dd0b2a597251c9742205577d4561c92ca9ba15d1afa7a58cb049441828b09b1d77ab1bee4d4cc6227d2673 SHA512 6755070c159402442b3e02ab21a9415313ddf82c6c54bd0a171b987c155bd85f6d0882d4146d02695fc4c157892106b9d1678235f92c28d7fe86fe8e9bb9486e -EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5953 BLAKE2B 0ec7119964117296614c6b628be687413ec34520566e03d9f21347e703ea3cb4dfe7b8423e97623fe1c1e1b8a02adc903f88f3231973b37e37b65da914f28549 SHA512 507194770b1410304a20b50a138579c2f0fdb55064693b6404ee509a9623e9174f063ce0f07f5b79da052f6e4b6d99c01b42be55113effb6aaa5c112c3fa7363 -EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 6064 BLAKE2B 19676df8ef52a132e14065bfaedf5f9b24a8f3596bdcdff36b8540d6e5e8030f2bbac0ef655a2e598445f8f895ca8fcf4e0f120712c32235f32a8468f88cb309 SHA512 82ac80a32a5edc80563f126bb5179dd126af6b130335822f86eab302e7f2349348388c6cc24fe8d7dd30645deea5601d78cf09591606b9d397a2d714ad34be98 -EBUILD compiler-rt-sanitizers-13.0.0.ebuild 6139 BLAKE2B 813642385c604919920b202db640c4b626bea776c5311d57b4d4b6d3af0a124ff414b1f5769492904c1c6d585ef1524224838f5d0a1fa1ed82a224f819d0e15c SHA512 04e3ddd1bc298ee4a87dcaf561bad2735f5991b29b85429cee419ab2949a61aa20f376e6acf5a401ab984b51a9e754060e1305d69b00ca678188440c9dd761f7 -EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 6064 BLAKE2B 19676df8ef52a132e14065bfaedf5f9b24a8f3596bdcdff36b8540d6e5e8030f2bbac0ef655a2e598445f8f895ca8fcf4e0f120712c32235f32a8468f88cb309 SHA512 82ac80a32a5edc80563f126bb5179dd126af6b130335822f86eab302e7f2349348388c6cc24fe8d7dd30645deea5601d78cf09591606b9d397a2d714ad34be98 -MISC metadata.xml 1387 BLAKE2B 0da208a4e86ac6bcbe8a4bd585954e808b66995f8506f199fad46ab6ed21e23ba3af856a9890961d2bcb3ef62b5d5184cf8cc5b69ade82c3733251a0f83bdf4b SHA512 8ae0880c2f6ea556e9954760ca43ceb77180e38999648029533f78768bcd1fed2e67e418d6ebf02621946bae6685ccc37be84a47f10e45a78c0b3ce285a20f0b +EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6054 BLAKE2B 0e7ecc21c987bdb184c18456c2d6482d268b6f04fa8a9e1694e2e4733c0ff5e0f5f93639358b1bb9ede250c1543dd89cdfadf1382aa334a4593b3655f1915c56 SHA512 e13805c26cf03152295f9794468910560932fdcc769a4dd9461f92172a20e41b38b9867d988c82ae7d9516c5f2b18e32d8e14bbbe0702c81b7f222eae51988ab +EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5971 BLAKE2B c71a8e7f9c741b7bb9ce9034312dd3fcea08a2097ec322126efe3ddc9f8d945f9aa02fbf6c0afdd12d19e2ec038e4894d74a149e83caf0aa59fad0cff84c2eee SHA512 9b7ea1e034d0d89cec9d5ff97e2bb34c09303f339c3d4fd4d4f31e2ba4ae7aab1bdcc8201afde8899c87892bdd7022104d90c78b8d4dab5f7c01787c21a41b17 +EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 6082 BLAKE2B 41bf42010e9a12a624c04d8c2d05e6ae31f9257561b4d0d95573d4dffd8463bf50a65f219e3541ea0a35630493f31600cbc3fb0a08163bc68fda4ee241d29068 SHA512 6e8ca73ad90955e6b6d7fbefed05ffc888da81af615995a752a99a9a46c0ced0bde661036c613b9f85f6064fc5d8cf577fe59d3793c4843bfb8e5bdb36045daf +EBUILD compiler-rt-sanitizers-13.0.0.ebuild 6152 BLAKE2B 595a843498fa2c53c7d50ccadec868bf5971326dbc1181516d98ce78dd70878f69bbc3e1f60a96d1a37847f72c1818a8f374344bf7f4f88261f274b4b8dba34f SHA512 d62e14e926ba08d25f86dccca81692c42dcd779bd75d34e11822f2234a0c45e2cd6b4f066ee03cc6fcf6cacb1c5ae9fb22497ff99431453d7feb2657b3bc715c +EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 6082 BLAKE2B 41bf42010e9a12a624c04d8c2d05e6ae31f9257561b4d0d95573d4dffd8463bf50a65f219e3541ea0a35630493f31600cbc3fb0a08163bc68fda4ee241d29068 SHA512 6e8ca73ad90955e6b6d7fbefed05ffc888da81af615995a752a99a9a46c0ced0bde661036c613b9f85f6064fc5d8cf577fe59d3793c4843bfb8e5bdb36045daf +MISC metadata.xml 1330 BLAKE2B 8381c36fb0ee37358cebacf512ee2a0ff6f2c0fc8e05544d9dc1bb1e11bc53f4196c2ecc6c8eb66c833f266c8d12da2c92a5f0b94cb3404397f925f9ebfc2a72 SHA512 6ea6159eb0929dc9f009ab326295549db329f7594dd5ff82e255238ed1fb17e3e8909079c915c6ae4829bb853666456772d17fa2078a332f6340807d6cd4f20e diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild deleted file mode 100644 index 470a4f5ab834..000000000000 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 - -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( compiler-rt ) -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) -LLVM_PATCHSET=10.0.1-4 -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" -KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc" -# FIXME: libfuzzer does not enable all its necessary dependencies -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )" -RESTRICT="!test? ( test ) !clang? ( test )" - -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options -DEPEND=" - >=sys-devel/llvm-6" -BDEPEND=" - clang? ( sys-devel/clang ) - elibc_glibc? ( net-libs/libtirpc ) - test? ( - !<sys-apps/sandbox-2.13 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} - sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" - -python_check_deps() { - use test || return 0 - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -check_space() { - if use test; then - local CHECKREQS_DISK_BUILD=11G - check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - check_space -} - -pkg_setup() { - check_space - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die - - llvm.org_src_prepare -} - -src_configure() { - # pre-set since we need to pass it to cmake - BUILD_DIR=${WORKDIR}/compiler-rt_build - - if use clang; then - local -x CC=${CHOST}-clang - local -x CXX=${CHOST}-clang++ - strip-unsupported-flags - fi - - local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" - # use a build dir structure consistent with install - # this makes it possible to easily deploy test-friendly clang - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}" - - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) - # builtins & crt installed by sys-libs/compiler-rt - -DCOMPILER_RT_BUILD_BUILTINS=OFF - -DCOMPILER_RT_BUILD_CRT=OFF - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer) - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile) - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize) - -DCOMPILER_RT_BUILD_XRAY=$(usex xray) - ) - if use test; then - mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - - # they are created during src_test() - -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/${CLANG_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ - strip-unsupported-flags - fi - - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then - mycmakeargs+=( - # disable use of SDK for the system itself - -DDARWIN_macosx_CACHED_SYSROOT=/ - ) - fi - - cmake_src_configure - - if use test; then - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* ) - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}" - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}" - - # 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/${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/${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 -} - -src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - # disable sandbox to have it stop clobbering LD_PRELOAD - local -x SANDBOX_ON=0 - # wipe LD_PRELOAD to make ASAN happy - local -x LD_PRELOAD= - - cmake_build check-all -} diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild index 83cbb9c75c10..e089a94c228c 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0-r1.ebuild @@ -33,7 +33,8 @@ RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" - >=sys-devel/llvm-6" + >=sys-devel/llvm-6 + virtual/libcrypt" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild index bfb20d554b32..5d5313171cc8 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild @@ -33,7 +33,8 @@ RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" - >=sys-devel/llvm-6" + >=sys-devel/llvm-6 + virtual/libcrypt" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild index fdf1c53a9663..80c9d7d0f6b4 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild @@ -33,7 +33,8 @@ RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" - >=sys-devel/llvm-6" + >=sys-devel/llvm-6 + virtual/libcrypt" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild index b70b3695c1f0..13512435fcd3 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+clang debug test elibc_glibc" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" @@ -33,7 +33,8 @@ RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" - >=sys-devel/llvm-6" + >=sys-devel/llvm-6 + virtual/libcrypt" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild index fdf1c53a9663..80c9d7d0f6b4 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild @@ -33,7 +33,8 @@ RESTRICT="!test? ( test ) !clang? ( test )" CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" - >=sys-devel/llvm-6" + >=sys-devel/llvm-6 + virtual/libcrypt" BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml index 46f57a5f9136..87fa65781b5e 100644 --- a/sys-libs/compiler-rt-sanitizers/metadata.xml +++ b/sys-libs/compiler-rt-sanitizers/metadata.xml @@ -11,7 +11,6 @@ <flag name="memprof">Build memory profiler runtime.</flag> <flag name="orc">Build ORC runtime.</flag> <flag name="profile">Build profiling runtime.</flag> - <flag name="sanitize">Build sanitizer runtimes.</flag> <flag name="xray">Build XRay runtime.</flag> <flag name="asan">Build Address Sanitizer runtime.</flag> diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest index 690663c098a5..ec07f7fb0707 100644 --- a/sys-libs/compiler-rt/Manifest +++ b/sys-libs/compiler-rt/Manifest @@ -1,16 +1,13 @@ -DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 -EBUILD compiler-rt-10.0.1.ebuild 2782 BLAKE2B cdc7937f616e86c3394d1cc68eeea05f3eebdcac051ca48e477d3a2cb765be1d616159f72a2b77ac21a0c2a4ebf1cc79f9d9cd23a2a1c7b26a4a252142c3af21 SHA512 4380bb10112f745e0034d36be105a1b4df159f34adafdd2b24157dc3652881ab8792e7758555ce167f59e2c3360b5d36b5d4f8d456df44fa5ee754f3c310677a EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb4491eeecb58ede43369ba9c294f624851214525f399cfa3adadee70ca66cbe64821376272b9965304266bcfc07b9f220 SHA512 f50906ee9f3b044a251ddd56db6ce10d3d2b632ffa7d3fd608cc5d7320e8d4b47b1ada26965b5fc9bb746e77c1b01ec61b5f719bc6bb2805720df035fca993da EBUILD compiler-rt-12.0.1.ebuild 3539 BLAKE2B 7d6bd0a7be4fec1b8427aa9d81eacf69d3338490c70f097910ad0bb4a67f0313ea8fd6bae15a5e05b8805cad6a789124d94ee91577a58beb96f471a1bf49c3b3 SHA512 bd671f1896182a00ade3b53252ba6b7cb8a6f65eec3d806bbfc7bd4e2b9253a8bc2bd497c018705f34fb30ad1897693af268c6e4cc39e044c788807042d7b55e EBUILD compiler-rt-13.0.0.9999.ebuild 3633 BLAKE2B 71e8599736191e3c621bfba764f8e7133fe78f1f6520ce32bbb2af010629096091e380d6958487c76ee5978bf16ef88b42d767cf09d2fdbefe2a8fc0a8adb932 SHA512 4a73ddead2969c3d4370dc9f543795a3714fd93b38ba6c819ccc7ea59caae018cdb50f3a580b1ba3a2a39d661992a419591c04b8027b28238b18ef421c61e2a3 -EBUILD compiler-rt-13.0.0.ebuild 3708 BLAKE2B b5783c01ccd878aa42f4483fc5568384db5c077743c20cbd11252e1a8437d6dd0f8108537b0b4547a8f7a6f130e95ad5fc93fc952d8e6b429e30d8e764ccc072 SHA512 bbe3d74fd239cc21f295addea93251993a5b21a4ab35734e530d7b803a6f1a7f5d225ca3d1983396b2f52a509dfda564d0fbebc08a3f95074f58f92fb2ddb31d +EBUILD compiler-rt-13.0.0.ebuild 3703 BLAKE2B 422d8938d97c2c28f8efc14007462dc590e6384b3b9dd00ca7c221fcaadf9d078bfa8ac309a04583d78cc54cd4433d625e3d9485b1a1aab1f226a5b21f372216 SHA512 15fb7c0a06bb49edf76b0436b12e30b272de864b79174c789b12ccd08afbd461953e2a6f1c8e7dc1339459dab97bbf5e9ff46c9e54f4cef08ef27adf901d9946 EBUILD compiler-rt-14.0.0.9999.ebuild 3633 BLAKE2B 71e8599736191e3c621bfba764f8e7133fe78f1f6520ce32bbb2af010629096091e380d6958487c76ee5978bf16ef88b42d767cf09d2fdbefe2a8fc0a8adb932 SHA512 4a73ddead2969c3d4370dc9f543795a3714fd93b38ba6c819ccc7ea59caae018cdb50f3a580b1ba3a2a39d661992a419591c04b8027b28238b18ef421c61e2a3 MISC metadata.xml 334 BLAKE2B e52ad011edc624e8b4c6449a9c77d0972222c4e3ecad01ea24eb9f3175053b191df6267886a186bc3e169581b86b624b6c77f37fac763a12129a1dd8cd6ee285 SHA512 1bf0f62c12690e6596650e8872405fc53bc3c4bbddcf80e02b3bcce9b762f0aa02d462949b9b54c0c930ca6cce5518333e79951ae57378def8eb9719463a9297 diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild deleted file mode 100644 index bcd5f4b351d2..000000000000 --- a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs - -DESCRIPTION="Compiler runtime library for clang (built-in part)" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( compiler-rt ) -LLVM_PATCHSET=10.0.1-1 -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" -KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="+clang test" -RESTRICT="!test? ( test ) !clang? ( test )" - -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options -DEPEND=" - >=sys-devel/llvm-6" -BDEPEND=" - clang? ( sys-devel/clang ) - test? ( - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) - ${PYTHON_DEPS}" - -python_check_deps() { - use test || return 0 - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - if ! use clang && ! tc-is-clang; then - ewarn "Building using a compiler other than clang may result in broken atomics" - ewarn "library. Enable USE=clang unless you have a very good reason not to." - fi -} - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -test_compiler() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \ - <<<'int main() { return 0; }' &>/dev/null -} - -src_configure() { - # pre-set since we need to pass it to cmake - BUILD_DIR=${WORKDIR}/${P}_build - - local nolib_flags=( -nodefaultlibs -lc ) - if use clang; then - local -x CC=${CHOST}-clang - local -x CXX=${CHOST}-clang++ - strip-unsupported-flags - # ensure we can use clang before installing compiler-rt - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - elif ! test_compiler; then - if test_compiler "${nolib_flags[@]}"; then - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" - fi - fi - - local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" - - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF - -DCOMPILER_RT_BUILD_PROFILE=OFF - -DCOMPILER_RT_BUILD_SANITIZERS=OFF - -DCOMPILER_RT_BUILD_XRAY=OFF - ) - - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then - mycmakeargs+=( - # disable use of SDK for the system itself - -DDARWIN_macosx_CACHED_SYSROOT=/ - ) - fi - - if use test; then - mycmakeargs+=( - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - - -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 - - cmake_src_configure -} - -src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake_build check-builtins -} diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild index 92894146cb09..564c29b11eaa 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest index 5175b30fc734..27a122f13157 100644 --- a/sys-libs/e2fsprogs-libs/Manifest +++ b/sys-libs/e2fsprogs-libs/Manifest @@ -1,10 +1,4 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3 -DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763 -DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d -DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f SHA512 27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d -EBUILD e2fsprogs-libs-1.45.7.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec -EBUILD e2fsprogs-libs-1.46.2.ebuild 2165 BLAKE2B 44cc1ac086d3ac2eb4c4d4f50d9ae5ded1d228d649a6cff419b004704bf53deb7990fd35b1deb3e7530e39a8dfb9c5b132c9e5c7c4f7ede6f13a1d62413f904b SHA512 e64cb7028755b02fa98eb0e7b3e469c36fec97207c16d6298fb162ce87ab2b05fe8a3539eea00f72d4e4053fff980339ed3fecad7bae0f512ca1a12af1e33165 -EBUILD e2fsprogs-libs-1.46.3.ebuild 2169 BLAKE2B 314050d578df28da88a24adc53d8c4809316f3d63a31a35198c0f79a0d6d78895a0a498acce05538a4d227a7c650234acca683372132dfbcfc7fc4fcff423b9c SHA512 e2497549c127a030cfcba925022f90fd67ca5fe3e1ae92b705d9a43ac67f3c4a07c6d8f0a6f1248552db570ca53c1a48dd4c19a1cc4e822c6fca24088f6bc120 EBUILD e2fsprogs-libs-1.46.4.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec MISC metadata.xml 463 BLAKE2B 076bfa2742b1e6abbd07bbf94f817aab64fcfa17e9c51314220e02bae2e9a209ebdafbd358e59655b471c25e47dfbe27745a50b0f929f2d640f06409f3e51804 SHA512 faab1a2ea1ddd7d9992fab3131b2a9b70a7f63b81f055856c8fbe9fe3c19a19044d1f2512252b29584914e06b0bc16d8d3ac02a59bc5706ea3509ebe1f65f5ed diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild deleted file mode 100644 index 722e3a0df067..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.7.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -MY_PN=${PN%-libs} -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="e2fsprogs libraries (common error and subsystem)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="static-libs" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41.8" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 -) - -src_prepare() { - default - - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" -} - -multilib_src_configure() { - local myconf=( - --enable-elf-shlibs - $(tc-has-tls || echo --disable-tls) - --disable-e2initrd-helper - --disable-fsck - ) - - # we use blkid/uuid from util-linux now - if use kernel_linux ; then - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes - myconf+=( --disable-lib{blkid,uuid} ) - fi - - ac_cv_path_LDCONFIG=: \ - ECONF_SOURCE="${S}" \ - CC="$(tc-getCC)" \ - BUILD_CC="$(tc-getBUILD_CC)" \ - BUILD_LD="$(tc-getBUILD_LD)" \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake -C lib/et V=1 - - emake -C lib/ss V=1 -} - -multilib_src_test() { - if multilib_is_native_abi; then - emake -C lib/et V=1 check - - emake -C lib/ss V=1 check - fi -} - -multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D}" install - - emake -C lib/ss V=1 DESTDIR="${D}" install - - # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support - # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and - # links to libcom_err.so). - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} - -multilib_src_install_all() { - # Package installs same header twice -- use symlink instead - dosym et/com_err.h /usr/include/com_err.h - - einstalldocs -} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild deleted file mode 100644 index a870ff5cc81a..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -MY_PN=${PN%-libs} -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="e2fsprogs libraries (common error and subsystem)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="static-libs" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41.8" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 -) - -src_prepare() { - default - - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" -} - -multilib_src_configure() { - local myconf=( - --enable-elf-shlibs - $(tc-has-tls || echo --disable-tls) - --disable-e2initrd-helper - --disable-fsck - ) - - # we use blkid/uuid from util-linux now - if use kernel_linux ; then - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes - myconf+=( --disable-lib{blkid,uuid} ) - fi - - ac_cv_path_LDCONFIG=: \ - ECONF_SOURCE="${S}" \ - CC="$(tc-getCC)" \ - BUILD_CC="$(tc-getBUILD_CC)" \ - BUILD_LD="$(tc-getBUILD_LD)" \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake -C lib/et V=1 - - emake -C lib/ss V=1 -} - -multilib_src_test() { - if multilib_is_native_abi; then - emake -C lib/et V=1 check - - emake -C lib/ss V=1 check - fi -} - -multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D}" install - - emake -C lib/ss V=1 DESTDIR="${D}" install - - # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support - # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and - # links to libcom_err.so). - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} - -multilib_src_install_all() { - # Package installs same header twice -- use symlink instead - dosym et/com_err.h /usr/include/com_err.h - - einstalldocs -} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.3.ebuild deleted file mode 100644 index 41da9ca3221d..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -MY_PN=${PN%-libs} -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="e2fsprogs libraries (common error and subsystem)" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="static-libs" - -RDEPEND="!sys-libs/com_err - !sys-libs/ss - !<sys-fs/e2fsprogs-1.41.8" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 -) - -src_prepare() { - default - - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" -} - -multilib_src_configure() { - local myconf=( - --enable-elf-shlibs - $(tc-has-tls || echo --disable-tls) - --disable-e2initrd-helper - --disable-fsck - ) - - # we use blkid/uuid from util-linux now - if use kernel_linux ; then - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes - myconf+=( --disable-lib{blkid,uuid} ) - fi - - ac_cv_path_LDCONFIG=: \ - ECONF_SOURCE="${S}" \ - CC="$(tc-getCC)" \ - BUILD_CC="$(tc-getBUILD_CC)" \ - BUILD_LD="$(tc-getBUILD_LD)" \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake -C lib/et V=1 - - emake -C lib/ss V=1 -} - -multilib_src_test() { - if multilib_is_native_abi; then - emake -C lib/et V=1 check - - emake -C lib/ss V=1 check - fi -} - -multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D}" install - - emake -C lib/ss V=1 DESTDIR="${D}" install - - # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support - # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and - # links to libcom_err.so). - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} - -multilib_src_install_all() { - # Package installs same header twice -- use symlink instead - dosym et/com_err.h /usr/include/com_err.h - - einstalldocs -} diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index e338437d6d26..4a3d2deae31e 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -23,7 +23,7 @@ DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6 DIST glibc-2.33-patches-4.tar.xz 60124 BLAKE2B a7a99f39c16df241745772c31b10946dc44c51e6c09f8a447b905e7dd6ba529aee08f66a581431453c6665485ac1848861559aa3f0aaba8c2061c1f1eb77d9be SHA512 05c33dc465a98097f836783bb5037dfa14b3a2c0c140014f642ea72954222ae919fe2db9573ee70ca9c1881b3b59dd4b815a8f39f331494fa12951c9012797ef DIST glibc-2.33-patches-6.tar.xz 64632 BLAKE2B f04ca4320d65c8796c67471cb56d3bf002cc34fb6a81075b85948e41c94df46cb2a3a944cced42d6d2c17ffc11e32a9840810864e655cc0fe18e6e0fe9f3c985 SHA512 b95746cd3415ec9ca275e542a2b5fddd5ce5680aa3bda08e94e96cf431191f7488ef6b7999ff0dfaf7405a4212531a75283e9bd7f5ae65bf572912038877a6df DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb -DIST glibc-2.34-patches-4.tar.xz 49256 BLAKE2B fa25745eab668932cec66cd77e1fe98f7f80af00841626741087c210fbe59523a8d76b9b40214e7a67b1a53267a990a0c90de7dd7da8590c6517aa0fb58c51bb SHA512 8afef6fc24e5eb32b063c7811e8aadb8f4c6548500e8c1a90787b1810deed1e176468477730f6ce6ae4523decf0acce7a36711cdd001666fa6b7d8d83af6347b +DIST glibc-2.34-patches-5.tar.xz 56832 BLAKE2B e5f5e8e41551d9f90355e9fc854e541cdcd5dd172e12dafa84256b7aeb999c0980ec6e7299701b78b0257980f5cf91019edfdf9796bec6b886434aa1960b2d6c SHA512 bc56fe2870629700d931150e1ebdc6e9b3318e8dabf5491d3645efd4db11032e21562e9276d97fc052c45362bfbca7f3d80d93277c2bf8aa3e05a5001df75c60 DIST glibc-2.34.tar.xz 17301232 BLAKE2B 874031192f2f5a3b35c3f5b044a467d4be4e67e8593e070e5b49b901ce8ea6bde2f8d2f6c92fa33b3f61eb723572a9e5f2b45e56064168df80a96d3fdb6fa30c SHA512 15252affd9ef4523a8001db16d497f4fdcb3ddf4cde7fe80e075df0bd3cc6524dc29fbe20229dbf5f97af580556e6b1fac0de321a5fe25322bc3e72f93beb624 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc @@ -35,7 +35,7 @@ EBUILD glibc-2.30-r9.ebuild 43400 BLAKE2B 01cbb9398dbe5d93f110f7c7ffe24d40719d86 EBUILD glibc-2.31-r7.ebuild 44522 BLAKE2B 1adfba68c35d3af5ec8476b2fe5d3bebf13880eeacb5aaa8438b41b98f5b275f0816a0e654446f62ee2f34f412c5c6e72befcc0deb8988b6faec2c53a07601a9 SHA512 5247b1d75efa86b1a1c85a09219f54d402aae8aaecf0e377ca663a984daf7c69ea97b3072fe83a20002ec7d72661ec7737fbc72982122b58c26cb5bc89997548 EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603b72a67e1451535040ddc83be6d1a90ad4b30f9623140b5c0a329ecafb6f19793390137e629d43a3c26e202b28a SHA512 0973b86c266e40203e301cf0c6f8fddc4273c002ffb8fd6c16f6e78f2cfdfbea95fda04adfebb8ee84a14dc950763ba706eadadb2e83f7982b800bee636d5d8f EBUILD glibc-2.33-r1.ebuild 45233 BLAKE2B 881f8eebb4c7e4e78760b92bd6cb64de2372abed3f15b916ab0d47f60d5cbceaaedf2624db92aec97a2742f205e7b243a02f7ddd3932a83ba8d0de3b40f72caf SHA512 54978040ee64ccc03bf8aea55af21775d8e360fcf5eeddad61b36c51dcc016849e9650270463e46edbd35e7eb6ffa1c72f1068031c80b6fca316980674c22dce -EBUILD glibc-2.33-r7.ebuild 47056 BLAKE2B cdc38cda15f2df199e0f4cf39b902e137b14f4b0bf44f6db2fa98842c022c9d8954dee1ce950d27f12451ad451c6c9ad4f3eb290489a5e7e16ffd4ebd386effa SHA512 b1c40a3b8ddbd794d7de3307ea83b95645faf44ce4f4cb409840d13544e314ca80b43e68a366a48fde4bc386f1edcfe7d7041b5e42ef8834b9166e31190a65a9 -EBUILD glibc-2.34.ebuild 47526 BLAKE2B f3cebb95bc7aeb7bf7ae824309c2114f5f31e0e773cc37315bf2dffbd771578d4995c4cd2734afd94767a2aea8940de1b9ddd337cbcf091f03c61284849c18bd SHA512 d527943d6fb733c260494c8f4ef592892c39021372395a8ae6ddcd33a200dc95618a8bf4cefd558e86d59db88bf219efcd2c0ee72f7baaa691f3e58a9012b205 -EBUILD glibc-9999.ebuild 47525 BLAKE2B 7007796c02ce7b333f0213e44e5bfaa1d68070f963febbc062b195506314e3474b471c7871c3b8f90fc82c6499396dcce58d0d04f216788b6b2cda3d8545a09b SHA512 e5ea4e3e1615d944cafd8772f457f714b7a9e3cabcb6cd54a5f1bcf5d702a4840ca95603c907f6286bda0f0f11ea69267bdd568248b1b0b28cdf42f73f7a075c +EBUILD glibc-2.33-r7.ebuild 46954 BLAKE2B da9c95ef74942a7261b8fb32b5ac926f71315e7197c8b235e4892bbdbbce1a4e3ad2c26c4587695dc54dd61f8cdbac274d1fb620815daec286ae8b682937ea2a SHA512 4861947122e6ccd3ddbdfe1f750dec174902ebf3778b6ac40dbda1b5e8598782800bfa40887a795858a7094ecb691f3647941d0dced05c3bedd113480c558c6e +EBUILD glibc-2.34-r1.ebuild 47425 BLAKE2B 0d1f27f4aea9ecf0eab109b9a978b16910469f2eb760711b6c6e8fac23924426cd02ac1b756455544797ee20373070d0d96b91aefbfcb05ef623a21cae4bb3a4 SHA512 6657fa2c75f8a42ec0b22977dfa9df855425946ca85c1969564fe1484bf88f954417288c1c9f4256f08d187ad1096016612add0425fde27a863058e4fe414061 +EBUILD glibc-9999.ebuild 47425 BLAKE2B 7fe569cfb3a09da55216c5c9b0e55808092ba8f88e5d244a62e846602f8ee00e8162ef398a81c9fc964f9f1d07d6af8ab32ae2a5c2df01968caeb08f9421a776 SHA512 0fd4f9959a984a847eb1215f124110263c1169994e29556410aed71c53fbaca5717df419b16ac4bc0a0a1cdac037fff154b8c30ee7a827b6af160bbe6471acff MISC metadata.xml 1556 BLAKE2B c8deb6ffdb2f6d045ea8c96dbefde33d108f8123d4c51351d77aa487db703b7312d26394e6c320b97e4955acbc0fc97c7ca918426f3bba3b1c2536c2461d334d SHA512 c47d15cf75001e40e6533bc157689d621e853966e70e504e540a16e1390dc0f122acaa705956d25b43683f9c633eb40bc2ffab64ce93f21a8a6346a9fc9dd51e diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild b/sys-libs/glibc/glibc-2.33-r7.ebuild index 146cce876a7f..20390ea8ba2a 100644 --- a/sys-libs/glibc/glibc-2.33-r7.ebuild +++ b/sys-libs/glibc/glibc-2.33-r7.ebuild @@ -3,7 +3,10 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +# We avoid Python 3.10 here _for now_ (it does work!) to avoid circular dependencies +# on upgrades as people migrate to libxcrypt. +# https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt +PYTHON_COMPAT=( python3_{7,8,9} ) TMPFILES_OPTIONAL=1 inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ @@ -23,7 +26,7 @@ PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then inherit git-r3 else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi @@ -1503,15 +1506,9 @@ pkg_preinst() { # Keep around libcrypt so that Perl doesn't break when merging libxcrypt # (libxcrypt is the new provider for now of libcrypt.so.{1,2}). # bug #802207 - if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then + if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then PRESERVED_OLD_LIBCRYPT=1 - preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16. - if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die - fi + cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die else PRESERVED_OLD_LIBCRYPT=0 fi @@ -1546,16 +1543,11 @@ pkg_postinst() { fi if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then + cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${T}"/crypt.h ]] ; then - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" - fi - elog "Please ignore a possible later error message about a file collision involving" - elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" elog "the upgrade working, but it also needs to be overwritten when" elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." elog "If you have FEATURES=collision-protect, please use FEATURES=unmerge-orphans instead!" diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34-r1.ebuild index f292dc31fc3b..f5d98be9cf6a 100644 --- a/sys-libs/glibc/glibc-2.34.ebuild +++ b/sys-libs/glibc/glibc-2.34-r1.ebuild @@ -6,7 +6,10 @@ EAPI=7 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc # Please read & adapt the page as necessary if obsolete. -PYTHON_COMPAT=( python3_{7,8,9,10} ) +# We avoid Python 3.10 here _for now_ (it does work!) to avoid circular dependencies +# on upgrades as people migrate to libxcrypt. +# https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt +PYTHON_COMPAT=( python3_{7,8,9} ) TMPFILES_OPTIONAL=1 inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ @@ -20,7 +23,7 @@ SLOT="2.2" EMULTILIB_PKG="true" # Gentoo patchset (ignored for live ebuilds) -PATCH_VER=4 +PATCH_VER=5 PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then @@ -1516,16 +1519,9 @@ pkg_preinst() { # Keep around libcrypt so that Perl doesn't break when merging libxcrypt # (libxcrypt is the new provider for now of libcrypt.so.{1,2}). # bug #802207 - if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then + if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then PRESERVED_OLD_LIBCRYPT=1 - preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die - fi - + cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die else PRESERVED_OLD_LIBCRYPT=0 fi @@ -1560,16 +1556,11 @@ pkg_postinst() { fi if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then + cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${T}"/crypt.h ]] ; then - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" - fi - elog "Please ignore a possible later error message about a file collision involving" - elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" elog "the upgrade working, but it also needs to be overwritten when" elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." fi diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index ce817f25421f..ce5ad8d3c43d 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -6,7 +6,10 @@ EAPI=7 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc # Please read & adapt the page as necessary if obsolete. -PYTHON_COMPAT=( python3_{7,8,9,10} ) +# We avoid Python 3.10 here _for now_ (it does work!) to avoid circular dependencies +# on upgrades as people migrate to libxcrypt. +# https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt +PYTHON_COMPAT=( python3_{7,8,9} ) TMPFILES_OPTIONAL=1 inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ @@ -1516,15 +1519,9 @@ pkg_preinst() { # Keep around libcrypt so that Perl doesn't break when merging libxcrypt # (libxcrypt is the new provider for now of libcrypt.so.{1,2}). # bug #802207 - if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then + if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then PRESERVED_OLD_LIBCRYPT=1 - preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1) - - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then - cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die - fi + cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die else PRESERVED_OLD_LIBCRYPT=0 fi @@ -1559,16 +1556,11 @@ pkg_postinst() { fi if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then + cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) - # Only copy if it exists; some people may have tiny embedded - # systems without headers: https://bugs.gentoo.org/802207#c16 - if [[ -f "${T}"/crypt.h ]] ; then - cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug" - fi - elog "Please ignore a possible later error message about a file collision involving" - elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" elog "the upgrade working, but it also needs to be overwritten when" elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." fi diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest index 1c235ffad23a..b29d8ecab217 100644 --- a/sys-libs/kpmcore/Manifest +++ b/sys-libs/kpmcore/Manifest @@ -1,5 +1,5 @@ DIST kpmcore-21.04.3.tar.xz 586264 BLAKE2B b9733f8b941fed98503e78b9c0357e002df92a39c4e70885822f6bb8944cf2c76be1fbba23e4cedf104b46a95832e72d2384c0d78abde312e0b2be40aa4d5745 SHA512 44614e3a0db646b81e56b87daa841b7b7e03ff97699ea393d83b6cc61e6c12efa36ac6b8aba87da612f2973a1d108bdad21ef0d73fc2db98595e5b711e5a0fcf -DIST kpmcore-21.08.2.tar.xz 589404 BLAKE2B 759d733a06daf9d701cb7a6c96ffe6a8d530156a4d5347addc5a36ef946bca28344468661b68e2b652783e779d3f65ce4ed416b6c0e5758861782e79e90c6587 SHA512 923eff5e3f9489f3c7f5d5943ecb739dbfc71d61b7e29e55df0aef3425af5fc84ac61d973678fff378c37084739d222d4140b1c9863e8c6bc3b44d753a8f66da +DIST kpmcore-21.08.3.tar.xz 589464 BLAKE2B 188a702b21976c352bea49c3e40e86c6d3f85b398c3dc9577301471c49cbbf8f161a5f6b62acfc020bcd9530aab2739a39023170c7586a1f18e52add4b2d6ecd SHA512 16570fe9b5e4e83d26b1c2e591d797cd23f37a2195ac5f043ee921d038d0e10d63f9d2c72c4d710e10eeb05d81a6df577f9ddb48b762b034154e399560daa7a7 EBUILD kpmcore-21.04.3.ebuild 738 BLAKE2B 283bdba57268a73410f37b011dc4b1d975bd4319497aed024073950a695c13ceb7b7912966da86ebbd71181a70539b443c81062f4abdf60895cb672e39688d4e SHA512 ec32c6db3717e1c8be8fff04cd566ef313fb5a7c6c6de2dc6d7b3dd18fcd4ebec16ee24d92bd8ff094dba7dc1ccb51f4eb921cc193eb4023096c346e5e955f6b -EBUILD kpmcore-21.08.2.ebuild 739 BLAKE2B b33db70a783bbfabdd5c3863896d8914346cb18e22a806a14418ed6800365d800f348e3b8540c063f33c78ce186240abe18274980ba165021b93824280da4e2e SHA512 8d73b3aca6a8ec64a2e93ee1f59f6ebe6d6bfa857067bcab8eb776795f2deb6789eb686ac55272b225a26c0549aea735fa8249d8c548a89f4882e8af33b17dda +EBUILD kpmcore-21.08.3.ebuild 739 BLAKE2B b33db70a783bbfabdd5c3863896d8914346cb18e22a806a14418ed6800365d800f348e3b8540c063f33c78ce186240abe18274980ba165021b93824280da4e2e SHA512 8d73b3aca6a8ec64a2e93ee1f59f6ebe6d6bfa857067bcab8eb776795f2deb6789eb686ac55272b225a26c0549aea735fa8249d8c548a89f4882e8af33b17dda MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/sys-libs/kpmcore/kpmcore-21.08.2.ebuild b/sys-libs/kpmcore/kpmcore-21.08.3.ebuild index ba39ac6ae27c..ba39ac6ae27c 100644 --- a/sys-libs/kpmcore/kpmcore-21.08.2.ebuild +++ b/sys-libs/kpmcore/kpmcore-21.08.3.ebuild diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index 2be3a8fff034..2e5ca44fdab7 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -1,13 +1,11 @@ AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd -DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344 -DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348 DIST ldb-2.3.1.tar.gz 1718379 BLAKE2B e2aa196e6e09846be2a631d81bf0b94c0cd80984ac124757888889717efdf78caf5501c4278ace33dcc2a6fb92a4a2f224b20ea9f3bf3fa5c7333f9994dcbdc1 SHA512 d87f3839481c3ac3f5ce5e2b5bb766451fe39681bff9c53747d45e2cdcef9f1eb91c0a7d6a9c202c4d01097600d66ca431a175f4fc28a126ad987b9783cb87bc +DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7 -EBUILD ldb-2.2.1-r1.ebuild 2932 BLAKE2B 004dc7b83fcd5705135df1e4848a49296b75d850152bc41bfff56ea1c352fd4a0e4f6074a0b96a54576e594b1f8f79ad669a22f39390b90489654180665fcf1c SHA512 8ec5dd9111c238dbad97e0a1ae1f0ebaf90a4e8e083dca3946e597a7d28922ae72ccedfa3e9b6425a997a3f2d21abf7c407231808415076b0dfc2126d47cd164 -EBUILD ldb-2.3.0-r1.ebuild 2939 BLAKE2B df5bfd3655a2e69311efcd256bd821eba1840a10dec3ebbbd52ffce44740495d1ff8082b561852db8eb93f27e28660f124b97c8ed5c164d23fbc56f3dd056aa6 SHA512 5bb570a204d962df72c8152c647f085dbd91532149b1b81478c7620085e27ebff1bc83061b3a4bae8fdc268d0ef009b4618c4cd50e42180a6cc05c7fb5dec242 -EBUILD ldb-2.3.1.ebuild 2939 BLAKE2B 8d3f481d13868b390175d3254ab6ef481dd053cd07f2910cb87d86c1d4bc9e3b2d0d830e644ca852af90a93d41743268f519c15d30bed5f70c9ecac220cc99dd SHA512 fca93d65145a20d661143e3e57b57782b2d64f66fd1af60c653f7e5ea1bb81adda1d9c6763fdbba3849720c84fa1f1121ac0b04ef1543fbc0bdb2ff57b9d6511 -EBUILD ldb-2.4.0-r1.ebuild 2946 BLAKE2B dde6e4beeec5907b3e32cfbc675bbd08d1f52081fd547d58e30b490305000c36be8a8d55b3daf9ad8b21edc8c7bc90fbd8984dad1bdff90273d1c66b3eb0b0ab SHA512 9994c7964012f99db5c6d2972e6e0a750a3632fcc25d0a6435fbc42bea3b067f8853efe018f7b9e25ea41420f9de325aff1c2e42fae8501c3ec314a9f2494c04 -EBUILD ldb-2.4.1.ebuild 2947 BLAKE2B 2b8f712078b6b9e46dfbd7efc452aad93fd81da3c82b76571449968bc63676dcc4c9d4dbb95c7e873351e200ba9ddc77cc407b7fdd7267994b1008e21d859ad0 SHA512 b1cdb6b52ad8eae4247da88b9825d835cbfc0fc51ebf014230cf3bd789ccbdd9a4e2301e457c45d4af48835f07ff12229879f7aa73a745d9d09fbb4dd26c8b06 +EBUILD ldb-2.3.1.ebuild 2958 BLAKE2B 4772b687017e2bf2b3caf8b0036e973351b1870999cda1f4d97734de5b7823a4a04881df2cc5dfd971ef74c649e6d208fe89b9a1b0e93b4edbd068d3c7e49cbc SHA512 a79c712823172a0d057066fa9130aa3d1044002cd26984714d60a9df8073cdbc119f2b497adaafee6ec06f42068e9ec287741c78adcaf77b58d58f3f2312390f +EBUILD ldb-2.3.2.ebuild 2965 BLAKE2B a48500904765bee47cb1602681eba2a315975dda608fadbbcd5e92035152a3b001c66520b9dcd40e0984c17b06cd9ec28d641e0311a1a62938f2242d1fb42194 SHA512 954d17af1bb7bcb1129deb25697cefa10876c50d478d7d7b302d1ad14cac95d2d55f7c6d5d6aaecabbda9a43c6ec021fc6f4a258ab170790bf54f0e93640a5a7 +EBUILD ldb-2.4.0-r1.ebuild 2965 BLAKE2B 5293b2e50baafd1d8456a754479490e7c33d901107c5e02626b776067b8b7513f3d5256bc651a31823f7f0dea9ec1f2ec0caa1044c0fb883fbed83555c27c1d2 SHA512 0e07f17782c88dd472d1d7e55df6241c04e535fbe7cb1cc7511dfb98fb2c13bb5b7e9ec0f101a93b50ca20eab5b439139c511ae4a707b630a3fd1adc470ac0c0 +EBUILD ldb-2.4.1.ebuild 2966 BLAKE2B 73acc4a2d887f831270afcabd5e8fbd5f864b040b77b1dbe169b1738dfab673641a9447e3cc5c35e69812698b7f980d803b26b4ab021032bbd70ae8027232d5c SHA512 0faa4a0b011ab32d57845ee12da878b13120775474c26321dc4d02fb9aa6f0a4c735d27f88ccce67adc98b2818658383b5263051031c227cdc3f7b4ac0045d40 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038 diff --git a/sys-libs/ldb/ldb-2.2.1-r1.ebuild b/sys-libs/ldb/ldb-2.2.1-r1.ebuild deleted file mode 100644 index 197d720205bb..000000000000 --- a/sys-libs/ldb/ldb-2.2.1-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --disable-rpath - --disable-rpath-install --bundled-libraries=NONE - --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba - --builtin-libraries=NONE - ) - if ! multilib_is_native_abi; then - myconf+=( --disable-python ) - else - use python || myconf+=( --disable-python ) - fi - waf-utils_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - waf-utils_src_compile - multilib_is_native_abi && use doc && doxygen Doxyfile -} - -multilib_src_test() { - if multilib_is_native_abi; then - WAF_MAKE=1 \ - PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ - waf test || die - fi -} - -multilib_src_install() { - waf-utils_src_install - - if multilib_is_native_abi && use doc; then - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -pkg_postinst() { - if has_version sys-auth/sssd; then - ewarn "You have sssd installed. It is known to break after ldb upgrades," - ewarn "so please try to rebuild it before reporting bugs." - ewarn "See https://bugs.gentoo.org/404281" - fi -} diff --git a/sys-libs/ldb/ldb-2.3.1.ebuild b/sys-libs/ldb/ldb-2.3.1.ebuild index 709bfb352734..b6e69d0d5297 100644 --- a/sys-libs/ldb/ldb-2.3.1.ebuild +++ b/sys-libs/ldb/ldb-2.3.1.ebuild @@ -37,7 +37,9 @@ RDEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/libcrypt +" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig diff --git a/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sys-libs/ldb/ldb-2.3.2.ebuild index 31a2105b4c36..5444904e23cf 100644 --- a/sys-libs/ldb/ldb-2.3.0-r1.ebuild +++ b/sys-libs/ldb/ldb-2.3.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..9} ) PYTHON_REQ_USE="threads(+)" inherit python-single-r1 waf-utils multilib-minimal @@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="doc ldap +lmdb python test" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -37,7 +37,9 @@ RDEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/libcrypt +" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig diff --git a/sys-libs/ldb/ldb-2.4.0-r1.ebuild b/sys-libs/ldb/ldb-2.4.0-r1.ebuild index e27020898909..e11b7972d4af 100644 --- a/sys-libs/ldb/ldb-2.4.0-r1.ebuild +++ b/sys-libs/ldb/ldb-2.4.0-r1.ebuild @@ -37,7 +37,9 @@ RDEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/libcrypt +" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig diff --git a/sys-libs/ldb/ldb-2.4.1.ebuild b/sys-libs/ldb/ldb-2.4.1.ebuild index af09e5b02590..36aa67609f5d 100644 --- a/sys-libs/ldb/ldb-2.4.1.ebuild +++ b/sys-libs/ldb/ldb-2.4.1.ebuild @@ -37,7 +37,9 @@ RDEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/libcrypt +" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest index e0e6a5b5bc95..d7fadbbb0466 100644 --- a/sys-libs/libapparmor/Manifest +++ b/sys-libs/libapparmor/Manifest @@ -1,3 +1,5 @@ DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 +DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5 EBUILD libapparmor-3.0.1.ebuild 2069 BLAKE2B 44518b8c99778d41aceafd10c4c4d66535ffa5f725651384d95f20dcb0946a8c49992fecd5495793f3434edded125148dd6932d77816cbc8f41c4c3d7e597e8a SHA512 505c9ae38475dffdeb1017a8678b3e72e1d2a449b0736c578e5ef35303356493c4b8315d8b2db99b7fdada4599ea2eeb499d9a396330a154e91f0a0c795d4943 +EBUILD libapparmor-3.0.3.ebuild 2070 BLAKE2B 2d67bee9521dc221efaf3631b6a0f67188ab428006ac33e10f99c31becdaf09b718cff188937c6130fd6019a2e389d40ba7dd9fc927c115b72356188d2eae578 SHA512 2fc27a9670389c392e79820bf445af66a217347b7842872bc1971784352bf8fc606839d8868537401e81fc7885803f5b770891f967b1bb15c20b74f9da23e07e MISC metadata.xml 410 BLAKE2B 220c545add2a0fb45a95c28e09ef0472ae92a0faebfb03effa69a8e202e137367756355c389c8d59e8d5d87a45e6df336a8424cf3c631d89595311d7095f049b SHA512 cff4f2dc12a85268da9fe6ce889a85d68669e7c940017f7617f7566c274394a8e145993c5e9d00c838acd0d41b2c82a7fee661bc31f9e5c54a2547f42ac7a98c diff --git a/sys-libs/libapparmor/libapparmor-3.0.3.ebuild b/sys-libs/libapparmor/libapparmor-3.0.3.ebuild new file mode 100644 index 000000000000..e35b3da8a32e --- /dev/null +++ b/sys-libs/libapparmor/libapparmor-3.0.3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{7,8,9} ) +GENTOO_DEPEND_ON_PERL="no" + +inherit autotools distutils-r1 perl-functions + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Library to support AppArmor userspace utilities" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="doc +perl +python static-libs" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/autoconf-archive + sys-devel/bison + sys-devel/flex + doc? ( dev-lang/perl ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig )" + +S=${WORKDIR}/apparmor-${PV}/libraries/${PN} + +# depends on the package already being installed +RESTRICT="test" + +src_prepare() { + rm -r m4 || die "failed to remove bundled macros" + default + eautoreconf + use python && distutils-r1_src_prepare +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with perl) \ + $(use_with python) +} + +src_compile() { + emake -C src + emake -C include + use doc && emake -C doc + use perl && emake -C swig/perl + + if use python ; then + pushd swig/python > /dev/null + emake libapparmor_wrap.c + distutils-r1_src_compile + popd > /dev/null + fi +} + +src_install() { + emake DESTDIR="${D}" -C src install + emake DESTDIR="${D}" -C include install + use doc && emake DESTDIR="${D}" -C doc install + + if use perl ; then + emake DESTDIR="${D}" -C swig/perl install + perl_set_version + insinto "${VENDOR_ARCH}" + doins swig/perl/LibAppArmor.pm + + # bug 620886 + perl_delete_localpod + perl_fix_packlist + fi + + if use python ; then + pushd swig/python > /dev/null + distutils-r1_src_install + + python_moduleinto LibAppArmor + python_foreach_impl python_domodule LibAppArmor.py + popd > /dev/null + fi + + dodoc AUTHORS ChangeLog NEWS README + + find "${D}" -name '*.la' -delete || die +} diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest index c4379aec19a0..c7cce1e04d92 100644 --- a/sys-libs/libavc1394/Manifest +++ b/sys-libs/libavc1394/Manifest @@ -1,3 +1,3 @@ DIST libavc1394-0.5.4.tar.gz 341679 BLAKE2B c27cf10b8769c1602488fa1a9a2536dee169e0e07185090e719946ca1da4b210aa61b37d816fb5b019d8b199b1c9285e2b212545f4332c8aad48af39c2dadf20 SHA512 ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a -EBUILD libavc1394-0.5.4-r2.ebuild 715 BLAKE2B 047063f96b6d9df6b6dcbb0ae47d7a36d6c29cfe94ce52fa4f993c721bf6b741986df6cedf39143312f1f0193f4f7670c719646316805a1acd67da20257ed613 SHA512 c0d642ae6e7a62cb2058dc2197f418024e59275a887dc75965a421ea98e5ce07a61a1b901a7ca829f01f3696c48d2aa82ff5beb4f474ec126c8c0e3bdc504e2b +EBUILD libavc1394-0.5.4-r2.ebuild 824 BLAKE2B f5e4baba1143a8a006ec93eaaa1701b4056bc515f6c458acbbab98d9c1a91683fc30477ad822a29ccb36c2c49edf73a748002e4aa74420a1dbf9eca86efbb95a SHA512 e1aa0edcd4169f19ce013786cccb50e7840f2166f27255c7fbe95facd8ed780125de67a1716c242818726b67434889f08578fd1d1bda4785e8a137a5fc66704b MISC metadata.xml 331 BLAKE2B a7f3377c550c7f79281c007bab5524367ed97623b6efa357dc4ef3d40e19839610761ebc4a0532879ae33dbde03d150e4ef03786bf34bb3ed2f5bc6cc21908c9 SHA512 77b5c5d66ccf456362097bf22e0104f997c5dfe010a9258a9e624bd3d0871a3fd1e6c3a36af472337a268ac2374f9392d335390c0bb2125bebbb33aa4297b862 diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild index 2bd1328cadf3..ecc3bbed45ea 100644 --- a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild +++ b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib-minimal +inherit flag-o-matic multilib-minimal DESCRIPTION="Library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set" HOMEPAGE="https://sourceforge.net/projects/libavc1394/" @@ -14,10 +14,14 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" BDEPEND="virtual/pkgconfig" -DEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]" +DEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + elibc_musl? ( sys-libs/argp-standalone )" RDEPEND="${DEPEND}" multilib_src_configure() { + # bug #713174 + use elibc_musl && append-libs -largp + ECONF_SOURCE="${S}" econf --disable-static } diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 43ffebdb8555..76f35072f6a2 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -1,16 +1,13 @@ -DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 -EBUILD libcxx-10.0.1.ebuild 5796 BLAKE2B c3c1e4d49ad96de1338998d35b0495ba2aa448db3558988bbbc9e5d4603d3d2ded354b1c04b186b0134be930edd72c931240ac3a068744e72e18087fc1550160 SHA512 7fbae29d2658305ddac7854a96e353ccf1901fcc6b1c15370d7a69a602f41b7d9f1afdd91018ea5be949955b3f8f1424903b5bac13d840e8f8c72ffcf7d7d34d EBUILD libcxx-11.1.0.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd3a3f4204f143e64c40bc89ebceb8e50c80215c6b54d7c8a3cce00fcecaac099298b41e010bf77655563d30a20 SHA512 ce56f24e7b4aed1405e682af6b3cb48bad6617d5b7e2ecf5b990fae4f7d6badc479a583ef24801e34b0155c12354a7b76a414402f89c31f228315eb92f279a62 EBUILD libcxx-12.0.1.ebuild 6700 BLAKE2B 95f0550dda3dc1b71a25dd2b3bf433f8fa92a12465a19558123dcf4704713af9c394544503eb1eed12251a392bf9ff91e69b994355a7f0fad5c00b5fa6457c26 SHA512 14c72df06a748c4788ad9e2f0e9de703e6ef3b9498f0ed8797ae2c31890754396cb2cdcb13b082b8f9a726929811cd421558a7867c9b1f5658827875fd2cf651 EBUILD libcxx-13.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba -EBUILD libcxx-13.0.0.ebuild 6747 BLAKE2B 7cc87bc74fe8839ad5e38c23c086b1a97dafbdde77ad28367c7da86c7c0fe1fd6d667f9cb8fd05490fd53ed13167e78e400e1ffff21bcbb53f498374e6d839b1 SHA512 b5015a446398c40ffada68cd4464d4ef2ec945379bf9c7b3603069a95e907ec0a0bc8d66f8c5f25b440036ad1d6dfaae5f09363ad2fc474f145d0308510ce487 +EBUILD libcxx-13.0.0.ebuild 6743 BLAKE2B 967212bda63df969dc62008caa53086ae90e0f8002345a943513cfc33d87ff1c50ad081f0b42a018eb984773f99a37212fc320b91140a006a8a9505cb7ccea6b SHA512 3da33c128ed5fe983b81e5257c039648716082246028e9fbb2b8deef0679b1170eaded4629eb29df74eb1d3b22008a871aa3bdca2b284fc1bb452ab4f65cf507 EBUILD libcxx-14.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2 diff --git a/sys-libs/libcxx/libcxx-10.0.1.ebuild b/sys-libs/libcxx/libcxx-10.0.1.ebuild deleted file mode 100644 index 5c7c50377c3b..000000000000 --- a/sys-libs/libcxx/libcxx-10.0.1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs - -DESCRIPTION="New implementation of the C++ standard library, targeting C++11" -HOMEPAGE="https://libcxx.llvm.org/" -LLVM_COMPONENTS=( libcxx ) -LLVM_PATCHSET=10.0.1-1 -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="amd64 arm arm64 x86" -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" -REQUIRED_USE="libunwind? ( libcxxabi )" -RESTRICT="!test? ( test )" - -RDEPEND=" - libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )" -# llvm-6 for new lit options -# clang-3.9.0 installs necessary target symlinks unconditionally -# which removes the need for MULTILIB_USEDEP -DEPEND="${RDEPEND} - >=sys-devel/llvm-6" -BDEPEND=" - test? ( >=sys-devel/clang-3.9.0 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" - -DOCS=( CREDITS.TXT ) - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_setup() { - llvm_pkg_setup - use test && python-any-r1_pkg_setup - - if ! use libcxxabi && ! tc-is-gcc ; then - eerror "To build ${PN} against libsupc++, you have to use gcc. Other" - eerror "compilers are not supported. Please set CC=gcc and CXX=g++" - eerror "and try again." - die - fi -} - -test_compiler() { - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ - <<<'int main() { return 0; }' &>/dev/null -} - -src_configure() { - # note: we need to do this before multilib kicks in since it will - # alter the CHOST - local cxxabi cxxabi_incs - if use libcxxabi; then - cxxabi=libcxxabi - cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" - else - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" - cxxabi=libsupc++ - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # we want -lgcc_s for unwinder, and for compiler runtime when using - # gcc, clang with gcc runtime (or any unknown compiler) - local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF - if use libunwind; then - # work-around missing -lunwind upstream - extra_libs+=( -lunwind ) - # if we're using libunwind and clang with compiler-rt, we want - # to link to compiler-rt instead of -lgcc_s - if tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_gcc_s=OFF - want_compiler_rt=ON - extra_libs+=( "${compiler_rt}" ) - fi - fi - fi - - # bootstrap: cmake is unhappy if compiler can't link to stdlib - local nolib_flags=( -nodefaultlibs -lc ) - if ! test_compiler; then - if test_compiler "${nolib_flags[@]}"; then - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" - fi - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} - -DLIBCXX_ENABLE_SHARED=ON - -DLIBCXX_ENABLE_STATIC=$(usex static-libs) - -DLIBCXX_CXX_ABI=${cxxabi} - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} - # we're using our own mechanism for generating linker scripts - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) - -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} - -DLIBCXX_INCLUDE_TESTS=$(usex test) - -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} - -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" - ) - - if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - - mycmakeargs+=( - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" - ) - fi - cmake_src_configure -} - -multilib_src_test() { - local -x LIT_PRESERVES_TMP=1 - cmake_build check-libcxx -} - -# Usage: deps -gen_ldscript() { - local output_format - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - cat <<-END_LDSCRIPT -/* GNU ld script - Include missing dependencies -*/ -${output_format} -GROUP ( $@ ) -END_LDSCRIPT -} - -gen_static_ldscript() { - local libdir=$(get_libdir) - local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") - - # Move it first. - mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die - # Generate libc++.a ldscript for inclusion of its dependencies so that - # clang++ -stdlib=libc++ -static works out of the box. - local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" - # On Linux/glibc it does not link without libpthread or libdl. It is - # fine on FreeBSD. - use elibc_glibc && deps+=" libpthread.a libdl.a" - - gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die -} - -gen_shared_ldscript() { - local libdir=$(get_libdir) - # libsupc++ doesn't have a shared version - local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") - - mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die - local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" - - gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die -} - -multilib_src_install() { - cmake_src_install - gen_shared_ldscript - use static-libs && gen_static_ldscript -} - -pkg_postinst() { - elog "This package (${PN}) is mainly intended as a replacement for the C++" - elog "standard library when using clang." - elog "To use it, instead of libstdc++, use:" - elog " clang++ -stdlib=libc++" - elog "to compile your C++ programs." -} diff --git a/sys-libs/libcxx/libcxx-13.0.0.ebuild b/sys-libs/libcxx/libcxx-13.0.0.ebuild index 62760143aefd..a4f36e792e65 100644 --- a/sys-libs/libcxx/libcxx-13.0.0.ebuild +++ b/sys-libs/libcxx/libcxx-13.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 376365de357b..d1df0e62afb9 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -1,11 +1,9 @@ -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 -EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df2b3f075194da3b053413ad8e0ff8f8669ce6263fa51ed0b02702e0bd611a77f4009e57a7d2659362db21c5665e4e SHA512 b9fef273fea1343aab604c3606fa4b9ed340e0e6f649e68f81f1285d96374f440ab787937b203ee5eba5b8e867a5926b48f63d8739c326fd1a646193635dd65e EBUILD libcxxabi-11.1.0.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3 EBUILD libcxxabi-12.0.1.ebuild 3543 BLAKE2B 23ac0eb64a29631b4bc4e18f3ae3cd03d8491b7a14cd88a35513da666c400e05ef2624c7eb214e0e4a6b297a993ca93ceedc0900bc3cdf850ff71157caa36f34 SHA512 0c7b72e68db1056f927283a361aa6771d77d5e5d8ecfb5f11a5204d82abd2843a9c6beccd7e2f2cbd95d23c4f4a863fb1cca7dd4f18ea66eb2f936af6ff5cb63 EBUILD libcxxabi-13.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725 -EBUILD libcxxabi-13.0.0.ebuild 3545 BLAKE2B f439e2a65eff6c2146c8f486a733f16a70a81213f8c456cd589c2c42df505405f0eb0834b970bfe4e81ba4f2f3c110400f763773d7f5a2c7706f38cc815d5971 SHA512 8857a124fff07e2d392f1424b25840523048473ab322e71d2304c41fca4e6882985d3ae20ce8b5349a13252315eaa17f3ba1d9e493b1a0fd531929c001c50edc +EBUILD libcxxabi-13.0.0.ebuild 3541 BLAKE2B c45771cf9395e4f17f9da1611bb72fa18e11e688d6ffd6d77336050db9035a44940968d0f2dfb957d3903a34e5d79ea39f2bc5553a13629767d046c11007b9cf SHA512 6f42b29927928675e96c162ce8ef53ad1672b571d02b37ec8c8b53ac8460f0544d9911765f2103c3d7278763e8f295cdcaa215f2143953bcddd69d68094f6564 EBUILD libcxxabi-14.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725 MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13 diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild deleted file mode 100644 index 7aa13e0d8e6e..000000000000 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs - -DESCRIPTION="Low level support for a standard C++ library" -HOMEPAGE="https://libcxxabi.llvm.org/" -# libcxx is needed uncondtionally for the headers -LLVM_COMPONENTS=( libcxx{abi,} ) -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="amd64 arm arm64 x86" -IUSE="+libunwind static-libs test elibc_musl" -RESTRICT="!test? ( test )" - -RDEPEND=" - libunwind? ( - || ( - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] - ) - )" -# llvm-6 for new lit options -DEPEND="${RDEPEND} - >=sys-devel/llvm-6" -BDEPEND=" - test? ( >=sys-devel/clang-3.9.0 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_setup() { - llvm_pkg_setup - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - # link against compiler-rt instead of libgcc if we are using clang with libunwind - local want_compiler_rt=OFF - if use libunwind && tc-is-clang; then - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ - ${LDFLAGS} -print-libgcc-file-name) - if [[ ${compiler_rt} == *libclang_rt* ]]; then - want_compiler_rt=ON - fi - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} - -DLIBCXXABI_ENABLE_SHARED=ON - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) - -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} - - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include - # upstream is omitting standard search path for this - # probably because gcc & clang are bundling their own unwind.h - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include - ) - if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - - mycmakeargs+=( - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" - ) - fi - cmake_src_configure -} - -build_libcxx() { - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxx - local BUILD_DIR=${BUILD_DIR}/libcxx - local mycmakeargs=( - -DLIBCXX_LIBDIR_SUFFIX= - -DLIBCXX_ENABLE_SHARED=OFF - -DLIBCXX_ENABLE_STATIC=ON - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF - -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) - -DLIBCXX_HAS_GCC_S_LIB=OFF - -DLIBCXX_INCLUDE_TESTS=OFF - ) - - cmake_src_configure - cmake_src_compile -} - -multilib_src_test() { - # build a local copy of libc++ for testing to avoid circular dep - build_libcxx - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die - - local -x LIT_PRESERVES_TMP=1 - cmake_build check-libcxxabi -} - -multilib_src_install_all() { - insinto /usr/include/libcxxabi - doins -r include/. -} diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild index 4c3c7882da70..47e8d7f440b0 100644 --- a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos" IUSE="+libunwind static-libs test elibc_musl" RESTRICT="!test? ( test )" diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index 0ce51a66e7f8..466b58423112 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,13 +1,11 @@ DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 -DIST llvm-gentoo-patchset-13.0.0-r1.tar.xz 6208 BLAKE2B 3d6ae036b59c62d50cad64e8f5a8ba9e0249bb824df0028656359ba1a72ea69a2c56a3f802b6c20e16f4272a504864578b48e1defe7986234307862b51240ae7 SHA512 642c32f43aacc760156e9e418de01c7b83f886ab4dc0ec79913ef5bb66f78eeae73c429477f2595263ddbd1a0b49f00420f1e954b1ff2d5d676a7a4a3a92aba5 -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 +DIST llvm-gentoo-patchset-13.0.0-r2.tar.xz 6500 BLAKE2B 0ce8d0c4a5508f70c8ec49dbc03dfbfc6371ac224bc5dfc9a39f71def0f574405a06df5666baf6159afafd83a8028c5ea6cb369f22a06f927f3ce6795e96994d SHA512 800d44b382c03b673b43965d80d6ed1b7e8e4ced8d066183b9b8df722b2cc002a6aa54092e600f0d77611be581d312f8886ce8af25b23ff818115a209ec21312 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 -EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591 EBUILD libomp-11.1.0.ebuild 2901 BLAKE2B e18155f24e5d0aa2de9a1976c818777e8d2d16092aa5e58b5c38197461a0b4ca5967ec161140b2a63835a0cfa601eb31fc08cbaa492088269808d6d803c7a47a SHA512 23a429ded341114ea3c4282b974520146ea0734e01b5863c837d119517b39365b537126091f5efcf752ca7860bccf0e0e2d763b507e903321532db87bcd42b79 EBUILD libomp-12.0.1.ebuild 2968 BLAKE2B 4e5511872021796bc51f8544a9f6ca5372650297c3c805a1bb16696def4901b34ad6ecbb7fcd4ce87a192e04aacda3d121b8dd62175e3ab3fab7d2a28095fe09 SHA512 d1f169993b83021c8c31b1911d827b62be19b916f2c53b7ef7b59d82b88c241d36eb054947d56bea13cf064f8737050d988ab6379be8a09e81bb04d7e333e3ff -EBUILD libomp-13.0.0.9999.ebuild 3503 BLAKE2B 4b9cf1639b5c458498ab23d7eb1ca6a7c165e1846ad084a470ebb9ee483b7c77ad8138ed4d5fec0117c6426c93fe35f7dc52e730042c2228a1b8ccf08bf8daae SHA512 c4068093bd2f53bfe85e9d64f0aa3d8de892dcffcdcc784190a991dafac516ce294bddde2a6d95a95bf0a827c18386d9561c5f3a6bbaf78ef87435a671d680e9 -EBUILD libomp-13.0.0.ebuild 3596 BLAKE2B 57713e5bb59c279ab699ab4bd9f9379d93d37e180eff85b0ef70db0bf87ffb1a53aa875b16677e0246602617a3e1f2f15920d869d562a576a98ad584e139cfd5 SHA512 239f1b9a2dcf5e44b5927188ff194fac4bbd2d94329c8cdd445179ce00739a7904d62e96e18315208ebd741752c33b0df8ff2e72e26f809ff9eb48a35c5c8a7b -EBUILD libomp-14.0.0.9999.ebuild 3503 BLAKE2B 4b9cf1639b5c458498ab23d7eb1ca6a7c165e1846ad084a470ebb9ee483b7c77ad8138ed4d5fec0117c6426c93fe35f7dc52e730042c2228a1b8ccf08bf8daae SHA512 c4068093bd2f53bfe85e9d64f0aa3d8de892dcffcdcc784190a991dafac516ce294bddde2a6d95a95bf0a827c18386d9561c5f3a6bbaf78ef87435a671d680e9 +EBUILD libomp-13.0.0-r1.ebuild 3815 BLAKE2B 83157bf0d69f4c15d268d059215228e00b4f192a70d91903e41c52aef04f79d90484d0b3e455cd8ea95aa0e6e4a0959c3af67f06793cf9b38a16dfd08564b2c2 SHA512 75da1352febcf3d596e9b733070fbf957a052c856a2e3710c4bbdc216f2a902fdfb1fc8ebdfaaca9194ee2414bcae44e83e5bdda9e018d183e04f762c5535a74 +EBUILD libomp-13.0.0.9999.ebuild 3727 BLAKE2B 684536b9dce5ebe7e0e973eb085ff923c55a9afff200943ec962c6169e0062543b4378dda72144001b3a8b8736fa3f94a3109bf4ef49013c154872f9f2b98215 SHA512 304eb23923016bbed50fd3cf63ecfa4b6d0d22e29c57a07c9034d4ec6edd96c66471c3bcc41067aa52a5cd1aec035b206dc2d87d9ffc04d76f9e13ed30d69eff +EBUILD libomp-14.0.0.9999.ebuild 3727 BLAKE2B 684536b9dce5ebe7e0e973eb085ff923c55a9afff200943ec962c6169e0062543b4378dda72144001b3a8b8736fa3f94a3109bf4ef49013c154872f9f2b98215 SHA512 304eb23923016bbed50fd3cf63ecfa4b6d0d22e29c57a07c9034d4ec6edd96c66471c3bcc41067aa52a5cd1aec035b206dc2d87d9ffc04d76f9e13ed30d69eff MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f diff --git a/sys-libs/libomp/libomp-10.0.1.ebuild b/sys-libs/libomp/libomp-10.0.1.ebuild deleted file mode 100644 index aa2905dc9eba..000000000000 --- a/sys-libs/libomp/libomp-10.0.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake-multilib linux-info llvm.org python-any-r1 - -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="https://openmp.llvm.org" -LLVM_COMPONENTS=( openmp ) -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos" -IUSE="cuda hwloc kernel_linux offload ompt test" -# CUDA works only with the x86_64 ABI -REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" -RESTRICT="!test? ( test )" - -RDEPEND=" - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] ) - offload? ( - virtual/libelf:=[${MULTILIB_USEDEP}] - dev-libs/libffi:=[${MULTILIB_USEDEP}] - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - )" -# tests: -# - dev-python/lit provides the test runner -# - sys-devel/llvm provide test utils (e.g. FileCheck) -# - sys-devel/clang provides the compiler to run tests -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - offload? ( virtual/pkgconfig ) - test? ( - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') - >=sys-devel/clang-6 - )" - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -kernel_pds_check() { - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then - local CONFIG_CHECK="~!SCHED_PDS" - local ERROR_SCHED_PDS="\ -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible -performance problems with libomp. If you are using one of the specified -kernel versions, you may want to disable the PDS scheduler." - - check_extra_config - fi -} - -pkg_pretend() { - kernel_pds_check -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local libdir="$(get_libdir)" - local mycmakeargs=( - -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" - - -DLIBOMP_USE_HWLOC=$(usex hwloc) - -DLIBOMP_OMPT_SUPPORT=$(usex ompt) - - -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload) - - # do not install libgomp.so & libiomp5.so aliases - -DLIBOMP_INSTALL_ALIASES=OFF - # disable unnecessary hack copying stuff back to srcdir - -DLIBOMP_COPY_EXPORTS=OFF - ) - use offload && mycmakeargs+=( - # this is non-fatal and libomp checks for CUDA conditionally - # to ABI, so we can just ignore passing the wrong value - # on non-amd64 ABIs - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) - ) - use test && mycmakeargs+=( - # this project does not use standard LLVM cmake macros - -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" - -DOPENMP_LIT_ARGS="$(get_lit_flags)" - - -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" - -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" - ) - cmake_src_configure -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake_build check-libomp -} diff --git a/sys-libs/libomp/libomp-13.0.0.ebuild b/sys-libs/libomp/libomp-13.0.0-r1.ebuild index 8771f7014c5b..6a1e4016def4 100644 --- a/sys-libs/libomp/libomp-13.0.0.ebuild +++ b/sys-libs/libomp/libomp-13.0.0-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" IUSE="cuda debug hwloc kernel_linux offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX" # CUDA works only with the x86_64 ABI @@ -46,7 +46,7 @@ BDEPEND="dev-lang/perl )" LLVM_COMPONENTS=( openmp llvm/include ) -LLVM_PATCHSET=${PV/_/-}-r1 +LLVM_PATCHSET=${PV/_/-}-r2 llvm.org_set_globals python_check_deps() { @@ -93,17 +93,24 @@ multilib_src_configure() { # disable unnecessary hack copying stuff back to srcdir -DLIBOMP_COPY_EXPORTS=OFF ) - use offload && mycmakeargs+=( - # this is non-fatal and libomp checks for CUDA conditionally - # to ABI, so we can just ignore passing the wrong value - # on non-amd64 ABIs - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) - - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) - # a cheap hack to force clang - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" - ) + if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) + # a cheap hack to force clang + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" + # upstream defaults to looking for it in clang dir + # this fails when ccache is being used + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)" + ) + else + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF + ) + fi use test && mycmakeargs+=( # this project does not use standard LLVM cmake macros -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild index c16560830be1..28c0f1fb620c 100644 --- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild @@ -92,17 +92,24 @@ multilib_src_configure() { # disable unnecessary hack copying stuff back to srcdir -DLIBOMP_COPY_EXPORTS=OFF ) - use offload && mycmakeargs+=( - # this is non-fatal and libomp checks for CUDA conditionally - # to ABI, so we can just ignore passing the wrong value - # on non-amd64 ABIs - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) - - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) - # a cheap hack to force clang - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" - ) + if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) + # a cheap hack to force clang + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" + # upstream defaults to looking for it in clang dir + # this fails when ccache is being used + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)" + ) + else + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF + ) + fi use test && mycmakeargs+=( # this project does not use standard LLVM cmake macros -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild index c16560830be1..28c0f1fb620c 100644 --- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild @@ -92,17 +92,24 @@ multilib_src_configure() { # disable unnecessary hack copying stuff back to srcdir -DLIBOMP_COPY_EXPORTS=OFF ) - use offload && mycmakeargs+=( - # this is non-fatal and libomp checks for CUDA conditionally - # to ABI, so we can just ignore passing the wrong value - # on non-amd64 ABIs - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) - - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) - # a cheap hack to force clang - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" - ) + if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU) + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX) + # a cheap hack to force clang + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")" + # upstream defaults to looking for it in clang dir + # this fails when ccache is being used + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)" + ) + else + mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF + ) + fi use test && mycmakeargs+=( # this project does not use standard LLVM cmake macros -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index c65a10e92b26..49fead95192a 100644 --- a/sys-libs/libseccomp/Manifest +++ b/sys-libs/libseccomp/Manifest @@ -1,8 +1,11 @@ +AUX libseccomp-2.5.3-skip-valgrind.patch 516 BLAKE2B d5dc87fcca8e20b7edd427c434d875c9c3c7aa130a651dbe06c2c648825312e330400f89177afcfe4985fa48e0f95de9937773deb6d3d83da9b2351e6e0488fc SHA512 96053f8ca6abc97ea7c5565c3c25563881e8c0363e9c38fa05836d59b5d9ea1a375f9e072bd5f89a67ddac159c1219be7ed829facd651b3fb8bd5071c89bddcb AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af DIST libseccomp-2.5.2.tar.gz 640305 BLAKE2B b61214cb9a9a793d1f04ae1de3f62c578cfaec54fcc355947b4c71efb75072bf60497db8c8a0fd34a46764952349027df3f025ddbd276d58be93209170950e89 SHA512 b2a95152cb274d6b35753596fd825406dae20c4a48b2f4076f835f977ecf324de38a3fe02e789dc20b49ecf6b4eb67f03e7733e92d40f5e20f25874307f1c2ac +DIST libseccomp-2.5.3.tar.gz 637572 BLAKE2B cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7 SHA512 00170fe2360f0c0b33293dccfcc33e98fabb99619f34ecefbcc92bfdaa249ba91e7433226545b842b71542a3b224b6e980ea2ae656c4addf07e84a0def1870a0 EBUILD libseccomp-2.5.1-r1.ebuild 2301 BLAKE2B a4d466901b4a8175108e3c0cf8a14c3987e74ce3272f3fd60177a912a2eafb8bfd997f7aa7a90f68c05cfbebc17a4096b50f31bba57f44753659db6368d51656 SHA512 56bf4ebf83113cc8407bb8e8bdcc42ea90d041f2590fa53b320836b5538af03d130bb0092996abd6d20cefeaad4cecaf213845772a22c13efcf0754e1473171e EBUILD libseccomp-2.5.1.ebuild 1987 BLAKE2B af2f16371d2053acc196f25e655e9ffc839114de5f3283128db57c36a04c528085502970b01cadf9434537c9e6a7d7dd869ef879cff321e352b0caea59b5962b SHA512 9b256b7f42bb28697edbd44613718c152d0f6bb4a6072748ecf873ce7ed4f44def744a465efbcdd6dd29f599a57ec3f13fe68b09357d92ac82525c798dbe4a74 EBUILD libseccomp-2.5.2.ebuild 2308 BLAKE2B 22a4b45f0133337b26c6d10391a1276ef1ca06ea4f3d1e3573b9922ca80485c4e7e16f5174d62059c9f6979b6a1cc267b7f5e0a56a2206951ebee9f2f62dbd0b SHA512 21c514240acebb47e708d716627816b861bbbdc7cb1201f4234758db163cbfcfb96a14c317476ff2002c04f68c40f579ae4dcd6a21c0870a731fac40b1d7977b -EBUILD libseccomp-9999.ebuild 2308 BLAKE2B 22a4b45f0133337b26c6d10391a1276ef1ca06ea4f3d1e3573b9922ca80485c4e7e16f5174d62059c9f6979b6a1cc267b7f5e0a56a2206951ebee9f2f62dbd0b SHA512 21c514240acebb47e708d716627816b861bbbdc7cb1201f4234758db163cbfcfb96a14c317476ff2002c04f68c40f579ae4dcd6a21c0870a731fac40b1d7977b +EBUILD libseccomp-2.5.3.ebuild 2408 BLAKE2B 26e9c336ef7d21c77e262afaa9c7068d432082d5e8367d86cef5405aca357f55dcb84a331e7dc87db0589d049d3ea5ba32aab373118ca09e0a93f2f5fbf986f1 SHA512 d20261580d5c7999fe220dda0f9f7f55fdd0acf81babd1919df6bd5d09aedd2047747c2aaff3cdd541245dc8fb94d27a290d90fb76c8048a201777e4330e5b43 +EBUILD libseccomp-9999.ebuild 2408 BLAKE2B 26e9c336ef7d21c77e262afaa9c7068d432082d5e8367d86cef5405aca357f55dcb84a331e7dc87db0589d049d3ea5ba32aab373118ca09e0a93f2f5fbf986f1 SHA512 d20261580d5c7999fe220dda0f9f7f55fdd0acf81babd1919df6bd5d09aedd2047747c2aaff3cdd541245dc8fb94d27a290d90fb76c8048a201777e4330e5b43 MISC metadata.xml 469 BLAKE2B 6dcc08de3598cce61438d1d0e6c35197159458a43a60c436d33a9f8a32acd3c132da2c76f8d79c5fbe1967b572759d21b5cd17d8e15c54528b5457e1e30aa3ac SHA512 153c1e0171b15997df762d353c1f5acae8f9c80e87a81d1fcd588ababa203279f08e4f82c5fab25e5e4c4ee28d4b208d40577b91749d57fc49dc557767d3ee92 diff --git a/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch b/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch new file mode 100644 index 000000000000..baf3ed971fc9 --- /dev/null +++ b/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch @@ -0,0 +1,13 @@ +Valgrind isn't supported on all arches (and indeed profiles for older types +of some arches) so let's just skip the automagic Valgrind dependency entirely. +--- a/tests/regression ++++ b/tests/regression +@@ -876,7 +876,7 @@ function run_test() { + run_test_bpf_sim_fuzz "$1" $2 "$3" + elif [[ "$4" == "bpf-valgrind" ]]; then + # only run this test if valgrind is installed +- if check_deps valgrind; then ++ if false; then + run_test_bpf_valgrind "$testnumstr" "$3" + else + print_result $testnumstr "SKIPPED" \ diff --git a/sys-libs/libseccomp/libseccomp-2.5.3.ebuild b/sys-libs/libseccomp/libseccomp-2.5.3.ebuild new file mode 100644 index 000000000000..847d2ce335b0 --- /dev/null +++ b/sys-libs/libseccomp/libseccomp-2.5.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 multilib-minimal + +DESCRIPTION="high level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. #551248 +DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" + ) + + default + + if [[ "${PV}" == *9999 ]] ; then + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + + eautoreconf + fi +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + --disable-python + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +do_python() { + # setup.py reads VERSION_RELEASE from the environment + local -x VERSION_RELEASE=${PRERELEASE-${PV}} + + pushd "${BUILD_DIR}/src/python" >/dev/null || die + "$@" + popd >/dev/null || die +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use python ; then + # setup.py expects libseccomp.so to live in "../.libs" + # Copy the python files to the right place for this. + rm -r "${BUILD_DIR}/src/python" || die + cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die + local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + + do_python distutils-r1_src_compile + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python ; then + do_python distutils-r1_src_install + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "${PN}.la" -delete || die + + einstalldocs +} diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild index eea16fa2bbf5..847d2ce335b0 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal @@ -22,7 +22,8 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="python static-libs" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -39,10 +40,14 @@ DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" src_prepare() { local PATCHES=( "${FILESDIR}/libseccomp-python-shared.patch" + "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" ) + default + if [[ "${PV}" == *9999 ]] ; then - sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + eautoreconf fi } @@ -52,12 +57,14 @@ multilib_src_configure() { $(use_enable static-libs static) --disable-python ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } do_python() { # setup.py reads VERSION_RELEASE from the environment local -x VERSION_RELEASE=${PRERELEASE-${PV}} + pushd "${BUILD_DIR}/src/python" >/dev/null || die "$@" popd >/dev/null || die @@ -72,6 +79,7 @@ multilib_src_compile() { rm -r "${BUILD_DIR}/src/python" || die cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + do_python distutils-r1_src_compile fi } @@ -86,5 +94,6 @@ multilib_src_install() { multilib_src_install_all() { find "${ED}" -type f -name "${PN}.la" -delete || die + einstalldocs } diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest index a6f55d9df113..cbc9e7a72e9c 100644 --- a/sys-libs/libxcrypt/Manifest +++ b/sys-libs/libxcrypt/Manifest @@ -3,6 +3,6 @@ DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 4c23af2a765495758e52c8e95d DIST libxcrypt-4.4.25-autotools.tar.xz 614652 BLAKE2B f0f4fbf92585fdd8d328aaa68811ea15bdf75778363ea4bc46a75fb76bb065f044708446d655356ebbf2834f8b14bac40fbe700b510b09ce101f750667a04298 SHA512 30f38a54c8e5cbd31c463223913079f9869d38ed38a2f64c57778ac4cf1b6f557caa527073df54ca8396bb7220807b84afcae2f9790f6604af1561a4b277874e DIST libxcrypt-4.4.26-autotools.tar.xz 617808 BLAKE2B 9fb8e31b22a085c0d0d5ab2ee3fb69fbebaccee2281e9be7d745218b5b92d949ffd3aa9c385671d58c93a654e16b943a33284b0b4737d52d26e43e2f7840fe74 SHA512 22c72cacd87c5751c4160413738fdf52c8fee300dcad01b289a6eaf892439883b9478103f791f5f53c8e5e2f2dd81057e5fda45e7cf7fdfd3ba93dd811bc01e3 EBUILD libxcrypt-4.4.20.ebuild 5817 BLAKE2B 5eee19a41bd26045175765c8bff8aecd0e035e5c46dd8b73a11f4f8ffd1360c91921c2881e058da504414eb33156511f07e3673fc321b36e49010e00a2294669 SHA512 181e26ade031ddc3a93103348326dca9ab7a546e69a00168b7e19b9cf5f148bffeba7dd6bdaf2e11649303305a72ca2bfd24360c005704930d5ef8f444881673 -EBUILD libxcrypt-4.4.25.ebuild 5861 BLAKE2B a127c535498f6d73c41d73010234279e159b1f251a206bc883b8add7907f850674625ba21aad4fc03186bf6858961d75609527674a1e7b9836a45b4f99525cb9 SHA512 4236d53dc902f23c0db4ef744df90748be0d1b3b6a31f01df2bc9608324e3f9333d8e22d2dba57f82eb630ea8c5da9d10697f246efc8514062484f9847c4589d +EBUILD libxcrypt-4.4.25.ebuild 5860 BLAKE2B 32df837f684d4792612cb718f7eef723a36ab423476294f4a271eb5ff5d1cf90ec12575b3ad715abda38b6a4622f80894276ca54f19fcf9a9db838a3eaf85b38 SHA512 361893c93b38c0a6086fd85c54ba975354a72cebffe9fbd7046a4e07934e6c6cc849e4d3d8d484de1cdc1ca9103f690ce11abaab7af5cdeed6fe1d4f72596fc0 EBUILD libxcrypt-4.4.26.ebuild 5867 BLAKE2B 416281733257433a1a39707a5db8cbaf39d0ccec3533d9d249c040206d1cfbe52b5467f00b29cbcb2ac5e909ee2707d299e0b4ed8d37a5764dc90853a829f17b SHA512 42713999095676b4c6a63c318ecae05ce90c5e824b7ec27ea796debb349fe2dbb76cb062a69d34e40868b896981647375bf68bf3f2e4b99d27256b995058130d MISC metadata.xml 831 BLAKE2B f8761f3758acf79afea36926a6488afb73c433a8faa599aa09a3bbc01b6c733d7264d7b584606158312825f099a1176623c70625a317a837de5bb20501f5ed22 SHA512 826ea578d9d3e651767e8f670d2bbb918c11e26ca5dc1c52ff7fbd513c39bee2d9423ecf16e47e2603f5a8c7b6979fd27eacde84182deb5a67004c9a3be281cb diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild index e71f4982bc58..e95748621284 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.25.ebuild @@ -20,7 +20,7 @@ fi LICENSE="LGPL-2.1+ public-domain BSD BSD-2" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+compat split-usr static-libs system test" REQUIRED_USE="split-usr? ( system )" RESTRICT="!test? ( test )" diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 821526cd1199..2c25182cbc4d 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -1,11 +1,9 @@ -DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 -EBUILD llvm-libunwind-10.0.1.ebuild 3184 BLAKE2B fb572b961b0f74f6fd3d63dc57ade4a5134729bc00ba2f7a0453f1e36172c9bc17f2cf3ca1d53822ed4b097dbfb04f7296dd0358b76e0333e3c743f4ab8965da SHA512 dfd536002c4bf0ce6428f0664eeeeb2de525d4ee0c7c99fc31be2be6065b6b7c9ff75378563c192971adb6fd184767af2db3816d0f15738d17ce62baf18aa6d3 EBUILD llvm-libunwind-11.1.0.ebuild 3222 BLAKE2B e9f47dd9859691d9c629b0eee62cf4e6d9a41e6f74b991410ee4cb1c647c828388a2ea7c1806df7350dcefff9a8178021956f85c7ec2aeb11d702a17e3b32132 SHA512 fc85afa5f560b2e7ad28c1e7d7b0d36b7bc0be408817b66f0d9afb3a811b94c24a282cbb13400685a2ffb00dbf620eb0c94d66fddfe27c9cffc2108f71c11a32 EBUILD llvm-libunwind-12.0.1.ebuild 3656 BLAKE2B cdf5e4e4f39ce47ac57ac43f287b5d6a42a61a79d988cdcd52823aadb0c1950abc85f5c1ba8276198e46357fc27f3ab7d06c0e7e9279a9a40e4dc7f4b936aac5 SHA512 c6477d4837e8e0d3ee6c035e0462e0a817752af214ff20ace3b8c3e377c749351cf78bf2ffec3d95085334f6b9a0a23e311f5a50109c390ad5bec60a0bef2dd5 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3699 BLAKE2B 02bcd98a5ce42eb08840fc416b7890bfb395312df055e5f572a3dd83f251dfaa2804928aee86515de294fc2fc448ab41ca58566765ef5a3e49c269d90e3dcc34 SHA512 6fe43b2bd1c074340860453ef87a18e7e9d2ebc03b48c2b34f6034f2cc5120d7f8f1959c428c753f04da557e7fa75d0edf90e50136da406708e9c731576b713e -EBUILD llvm-libunwind-13.0.0.ebuild 3747 BLAKE2B 5569fa73fdc6b56824bf336fb536730186e679b85c0c4818211c0de10e18d8ee59b9b9778959ef12ec5b3d0b80ca9fd912420e9ac884ceb9a0947a9ac571a4aa SHA512 606ec3a9f8bf593100e7e086483e2adc9be2e48bd0faf31ae89bbf00d96c63b8bbf07f290adaf723f8a4593b604bc2200e50a397e4f296c9474760fd11673756 +EBUILD llvm-libunwind-13.0.0.ebuild 3742 BLAKE2B 4a7970b353e54065d12dd9f86167c62cd87dbb91b8f390292d700cd0ac85bd06afc5c554031aa7d51339569d7095a3e5027f162843c36d4c59352dc3acc9a4ca SHA512 da7f8182da485e0d4608fde4bfc99e1890ff4a4b19a2c49c276f025633d48483db730b8b1622944a9b3d8e412ce2bc1aedf50f57397c2beb6ca13f5eb77ebe44 EBUILD llvm-libunwind-14.0.0.9999.ebuild 3699 BLAKE2B 02bcd98a5ce42eb08840fc416b7890bfb395312df055e5f572a3dd83f251dfaa2804928aee86515de294fc2fc448ab41ca58566765ef5a3e49c269d90e3dcc34 SHA512 6fe43b2bd1c074340860453ef87a18e7e9d2ebc03b48c2b34f6034f2cc5120d7f8f1959c428c753f04da557e7fa75d0edf90e50136da406708e9c731576b713e MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild deleted file mode 100644 index ad26bc1602f2..000000000000 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake-multilib llvm llvm.org python-any-r1 - -DESCRIPTION="C++ runtime stack unwinder from LLVM" -HOMEPAGE="https://github.com/llvm-mirror/libunwind" -LLVM_COMPONENTS=( libunwind ) -LLVM_TEST_COMPONENTS=( libcxx{,abi} ) -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="amd64 arm arm64 x86" -IUSE="debug static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="!sys-libs/libunwind" -# llvm-6 for new lit options -DEPEND=" - >=sys-devel/llvm-6" -BDEPEND=" - test? ( >=sys-devel/clang-3.9.0 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local libdir=$(get_libdir) - - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) - -DLLVM_INCLUDE_TESTS=$(usex test) - - # support non-native unwinding; given it's small enough, - # enable it unconditionally - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON - ) - if use test; then - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" - - mycmakeargs+=( - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" - ) - fi - - cmake_src_configure -} - -build_libcxxabi() { - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi - local BUILD_DIR=${BUILD_DIR}/libcxxabi - local mycmakeargs=( - -DLIBCXXABI_LIBDIR_SUFFIX= - -DLIBCXXABI_ENABLE_SHARED=OFF - -DLIBCXXABI_ENABLE_STATIC=ON - -DLIBCXXABI_USE_LLVM_UNWINDER=ON - -DLIBCXXABI_INCLUDE_TESTS=OFF - - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include - ) - - cmake_src_configure - cmake_src_compile -} - -build_libcxx() { - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxx - local BUILD_DIR=${BUILD_DIR}/libcxx - local mycmakeargs=( - -DLIBCXX_LIBDIR_SUFFIX= - -DLIBCXX_ENABLE_SHARED=OFF - -DLIBCXX_ENABLE_STATIC=ON - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF - -DLIBCXXABI_USE_LLVM_UNWINDER=ON - -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) - -DLIBCXX_HAS_GCC_S_LIB=OFF - -DLIBCXX_INCLUDE_TESTS=OFF - ) - - cmake_src_configure - cmake_src_compile -} - -multilib_src_test() { - # build local copies of libc++ & libc++abi for testing to avoid - # circular deps - build_libcxxabi - build_libcxx - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die - - local -x LIT_PRESERVES_TMP=1 - cmake_build check-unwind -} - -multilib_src_install() { - cmake_src_install - - # install headers like sys-libs/libunwind - doheader "${S}"/include/*.h -} diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild index 5c57e2bc3cd3..5e5505362a33 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~x64-macos" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest index 1c7bf58934e9..f466dd442839 100644 --- a/sys-libs/musl/Manifest +++ b/sys-libs/musl/Manifest @@ -6,5 +6,6 @@ DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee EBUILD musl-1.2.2-r3.ebuild 3814 BLAKE2B 037af7d810ace77441369b4dc9a8513298167bbe7af7a010ad22f6ff7e99aba2cac0b6b8befd51f080fb3c695452ec7a3cecbdeb46cbfd06d2aef2415a96c28e SHA512 48cb68039a1cc61b230d2c9b549f01c40607ef2a0726589e558e412311f7e1ae988c7328f86b61b148ba88f2f107c72b2829ccd8ba16567a52a3840f2286d477 -EBUILD musl-9999.ebuild 3692 BLAKE2B 1c5437d46c9c246d3f618416f07e209af31c1dae22abdfd7a5afd25a49f163511e9de93679d89edaf553646b10d349ab3b41f652b54270bad65e0f0461c893a9 SHA512 00d876467974f641804e1a27560c348c3eb25d7b9d776160fd505810e68a7c7afb82b228acd5d2787e3bb05c3878e6bf26912efa4c5ad8f38fc7635b04302270 -MISC metadata.xml 454 BLAKE2B 08db5150594aa227d36fee3890fefc98480fa084cc8c0975634c82887c92a2a57b2d16c2816ec1b62d008b0508656209762fa3f66e29eeeeb9a9d6b3103a4aa8 SHA512 b118c9458afb4fd889c58551d1318a586c3c4ddd4bc26e34e115e220c01df56706044ded653dcd2391069552c6c11b9efd2155f973f5e30e1d6432ab4212111a +EBUILD musl-1.2.2-r4.ebuild 4448 BLAKE2B 36bf867d0b6484bbba80c83df074cc0915612ce447925b03343da441f55e53d1ea10210e7f30e36ae0ad5c36e8bcc2333eba04e5534c0db94af784ad27a3223b SHA512 18fa3cf43fd4f9c29eece8b61f6db7dcf6781122ef81860d84af7e9689095f32afc54bce63692436b4736362710d974220d0f69357d454d13bce1b8352dee5f6 +EBUILD musl-9999.ebuild 4320 BLAKE2B e0a1b35cd77bbd0e0187c15680dd2d0d6925d66901d0c087787eaa226435dfd085211277138dda7299723a2c96a52431323b23f3a90c9562441c2f1a05a1dd25 SHA512 3d6e61bb736907e4420dff142055040d85fbf4f06ed181290a779245be7b30be8c02016d2ac241b10475fecfbd408c7b6f5f9289af22bbf3c41c8e43a5180a3d +MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92 diff --git a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml index ffcc1ba7137d..e3dfac351e2a 100644 --- a/sys-libs/musl/metadata.xml +++ b/sys-libs/musl/metadata.xml @@ -12,4 +12,8 @@ <email>toolchain@gentoo.org</email> <name>Gentoo Toolchain Project</name> </maintainer> + <maintainer type="project"> + <email>musl@gentoo.org</email> + <name>Musl project</name> + </maintainer> </pkgmetadata> diff --git a/sys-libs/musl/musl-1.2.2-r4.ebuild b/sys-libs/musl/musl-1.2.2-r4.ebuild new file mode 100644 index 000000000000..0fe2c8c9a67b --- /dev/null +++ b/sys-libs/musl/musl-1.2.2-r4.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eapi8-dosym flag-o-matic toolchain-funcs +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.musl-libc.org/musl" + inherit git-r3 +else + SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" +fi +GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab" +GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" +SRC_URI+=" + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} + https://dev.gentoo.org/~blueness/musl-misc/iconv.c +" + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" +HOMEPAGE="https://musl.libc.org" +LICENSE="MIT LGPL-2 GPL-2" +SLOT="0" +IUSE="headers-only" + +QA_SONAME="/usr/lib/libc.so" +QA_DT_NEEDED="/usr/lib/libc.so" + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +just_headers() { + use headers-only && is_crosscompile +} + +pkg_setup() { + if [ ${CTARGET} == ${CHOST} ] ; then + case ${CHOST} in + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + unpack "${P}.tar.gz" + fi + mkdir misc || die + cp "${DISTDIR}"/getconf.c misc/getconf.c || die + cp "${DISTDIR}/${GETENT_FILE}" misc/getent.c || die + cp "${DISTDIR}"/iconv.c misc/iconv.c || die +} + +src_prepare() { + default + + # Expand gethostid instead of being just a stub + eapply "${FILESDIR}/${PN}-1.2.2-gethostid.patch" +} + +src_configure() { + tc-getCC ${CTARGET} + just_headers && export CC=true + + local sysroot + is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} + ./configure \ + --target=${CTARGET} \ + --prefix=${sysroot}/usr \ + --syslibdir=${sysroot}/lib \ + --disable-gcc-wrapper || die +} + +src_compile() { + emake obj/include/bits/alltypes.h + just_headers && return 0 + + emake + if [[ ${CATEGORY} != cross-* ]] ; then + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${WORKDIR}/misc" + fi + + $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die + $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} + just_headers && return 0 + + # musl provides ldd via a sym link to its ld.so + local sysroot + is_crosscompile && sysroot=/usr/${CTARGET} + local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) + dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd + + if [[ ${CATEGORY} != cross-* ]] ; then + # Fish out of config: + # ARCH = ... + # SUBARCH = ... + # and print $(ARCH)$(SUBARCH). + local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) + + if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then + # During cross (using crossdev), when emerging sys-libs/musl, + # if /usr/lib/libc.so.1 doesn't exist on the system, installation + # would fail. + # + # The musl build system seems to create a symlink: + # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) + # During cross, there's no guarantee that the host is using musl + # so that file may not exist. Use a relative symlink within ${D} + # instead. + dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1 + + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die + fi + + cp "${FILESDIR}"/ldconfig.in "${T}" || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${T}"/getconf + dobin "${T}"/getent + dobin "${T}"/iconv + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die + doenvd "${T}"/00musl + dolib.a libssp_nonshared.a + fi +} + +pkg_postinst() { + is_crosscompile && return 0 + + [ "${ROOT}" != "/" ] && return 0 + + ldconfig || die +} diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 56a2bbbc42f6..5736eadc0fb4 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit eapi8-dosym flag-o-matic toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -120,7 +120,23 @@ src_install() { # SUBARCH = ... # and print $(ARCH)$(SUBARCH). local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) - [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die + + if [[ ! -e "${D}"/lib/ld-musl-${arch}.so.1 ]] ; then + # During cross (using crossdev), when emerging sys-libs/musl, + # if /usr/lib/libc.so.1 doesn't exist on the system, installation + # would fail. + # + # The musl build system seems to create a symlink: + # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) + # During cross, there's no guarantee that the host is using musl + # so that file may not exist. Use a relative symlink within ${D} + # instead. + dosym8 -r /usr/lib/libc.so.1 /lib/ld-musl-${arch}.so.1 + + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die + fi + cp "${FILESDIR}"/ldconfig.in "${T}" || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die into / diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 5abe0d35bca6..9013b2d69b92 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,15 +1,15 @@ AUX ncurses-5.7-nongnu.patch 361 BLAKE2B 9260be98295203137327e37a15480bf96742ec5a62a693af04e929ba7ac8528e2810b267960d7cde5b20e8ee72bb447e34a681b567e74d5e4e9325a3613292c1 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f -AUX ncurses-5.9-gcc-5.patch 1367 BLAKE2B ecbf3c307e5543c4f32a4db54f0e7c97ef0e5f68ebef9a974265e4f002a4789f5e3629a68eb455e45f6cc43f7b05a9eb6db6675dc0c9b83d61785fc10d67fb4b SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c -AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983df744d40573b4fc2488d3f26f40ed77aba2d15da2a006e56217216740e26a295c9ab9c4be78df201514040376a986cf1b30 SHA512 db333b400ad23110bff80d86eca39e5656870caa06083b6d7098503fe34a46e387d207b135bf9aa9a0a1f2eca2a9b094f1d189ea8f8a17caaec4fc14b819fcc4 AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6 -AUX ncurses-6.2-no_user_ldflags_in_libs.patch 1254 BLAKE2B ccc2cd660bf102b61118f0ca170d079454b47a2eee41f9fb1e2b82dc241233adeb1481221fc25ce15b8c101cab200e5eefffde4ff0fbf102d8acf16fe222c40c SHA512 17e365302c683b7fc59b4ed870738b8ab487b9cc1e074d9629e1963120b6ea69b4c3b47b42c80524630d56e1b27519c6f8451397ae892ad759d1d0f019057418 AUX ncurses-6.2_p20210123-cppflags-cross.patch 1246 BLAKE2B f2e6d5b3f106639435f1901f0a43aaf9ab1cfcc2c295f13cd51120f13bb09ee4e6863aee3e6036b175479235ba8804622ad1ad4e4f181e9ca7ac67ae98ff13f1 SHA512 89a1471bc1dec666a593819b15d778d061fb370fc9786251b0546535cebf46b7ff61579937e64bf35cd15e4b8493e49c74625fb9686bb003935eef017cf449da DIST ncurses-6.2-20210619-patch.sh.bz2 836967 BLAKE2B f210bf25c33f11d67e54a6f416aae75f0a976880ea543408780fd3a8dc992ee8d9999bf15c925c79504be0f30ade4bbfaed763abedd2b2d6b35de65b353a6314 SHA512 b8392bf6c0b7570766ae31a043df311660201265dfe3e2e49425b1e2aa08c72030b5f5b6c7871532897596262c88a7192e3ff2adfdc618f1b9c13c22c373eeb3 DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d +DIST ncurses-6.3-20211026.patch.gz 117363 BLAKE2B 74c6c80271edc3b69d17c891436e48ee0579b3d16dd1bbd42f953be5b6ef07596343abd34f4d508b0cb371c1c0febfec12d65e938739892a617c8b141f599753 SHA512 25a99bc9cb7a18eb8fd16a0f887bae90c2551e0228b077d28f7217e58190f4b19a526350c999922f7394a1b749e834643c1bf5f339248b842717c146a3ec1df4 +DIST ncurses-6.3-20211030.patch.gz 46304 BLAKE2B 6fa0f5223c97dc045117c208b92e75aad61638585506aeed0fa5cd6b215f67d212fc780e527f1281ae77063edb1ef9b3a3671b00d306fe322c3ca1b34c1d4d81 SHA512 90440af3959a17388999f07a3b40f770c5511bceda6a39d4c56f867dc5ae8494e49cfb700eb79e31422ebfd1b1990f6d7912083c688963139446f1e43e9d08c8 +DIST ncurses-6.3-20211106.patch.gz 3995 BLAKE2B fbacfd6bfbf64b2935d47f648bd74c93136ea8d17b51e218b80a24695b52246ce8ec01704a0636692bae72815c8b93dec8573570dfd126b19645ec90926e818a SHA512 799819ed01967387fdca4755ab44401f0dc90306f6f771c894ce6702c929e2ff87f45d3e1c2e683cc32bb01553f3332c3a7591a00b7a4bdff93da25307379bdc DIST ncurses-6.3.tar.gz 3583550 BLAKE2B b2c174ac48d587b4d3aa054f04e4ec8bffd8a657a4aff5f090104965c741901e600712c8f8e5e98f3b8a26bc558996a1e14a746f113854832853b855e9d406c3 SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 -EBUILD ncurses-6.2-r1.ebuild 10032 BLAKE2B 6e814d1fe9745134b9761a810ca4dd71db68e63381e3f4c79a5c6f59391fd2d77207fde68e1a2d756902e3cd68787c34767b8a85ee6fa708d35ec318b9f9698d SHA512 4525783da7a602430d9a5ee346d69f25ce9d9d02222fba57286d3eca66773b149f6191225ffb03fb5f5d5454e29b9122b61a06c54901d9671f301d1cb5ee97c5 EBUILD ncurses-6.2_p20210619.ebuild 9938 BLAKE2B e051c20b6dc781586bbb7de7986983c33c1c74df8599148b23bf7e82754c696bd814b5e95e77e4cf346dcd08c507fa9d2e90898f4f77921379bfa155f9a2d9aa SHA512 dec3574e7afc360b2bb165c923b8ea27edd30269dbab96027ad4966b16f2a80aca8d677afbac01cbd0c215459d84d9c239fb03a684771485d3d9e0be0430cc45 EBUILD ncurses-6.3.ebuild 10059 BLAKE2B 49d54b5c55b66745ad0cb6467a59cad1f3774378ee42cd655d0a94627c5500ea5f045db81f7e774b0afcb966cfaaf8ef106fd081af5a0f83b90ee029ebe2a998 SHA512 5c2388851eb130dcaae8db6f411bfe441a46dc7ca8a5849978edb8d8ea47fb2aa55354ed600c17c01b59acb36c3027bb1c8cb622c8b43e118848de855f3bade6 +EBUILD ncurses-6.3_p20211106.ebuild 10921 BLAKE2B 0ce736bbe7a3d2a11fcca2be97a0fe04167098b95ddb9529487338cb81370e2b171f49e8c850a6ee9e1a0a80ec84fb854eeddaf0904d6eb97b81868474c44bd4 SHA512 15272a24a0dc190b7be5290412f1bd3c009327ca18f41eac281fb5ebe5923482040fc425a7a58b367e3988bdb448a56886e387bb8e00e1d1a61ff333112245cd MISC metadata.xml 785 BLAKE2B e8c25458707dab787caf921aaa2fc4a6f66a1cc2c7bf23a6dda74bb9d990f92de7507fc81c83858fc55937d044e45523b2c22b65f86a4bb74ae463ead9781493 SHA512 ac0255fbb20bab036908eab351bf6798856e1b97c02258df158650e732d8b367df20bd1e0674b427cb4d9832662cb2cc02b4e77e124388e470b2dd116245cfaf diff --git a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch b/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch deleted file mode 100644 index 2448229b88e1..000000000000 --- a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/545114 - -extracted from the upstream change (which had many unrelated commits in one) - -From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" <dickey@invisible-island.net> -Date: Sun, 7 Dec 2014 03:10:09 +0000 -Subject: [PATCH] ncurses 5.9 - patch 20141206 - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh -index d8cc3c9..b91398c 100755 ---- a/ncurses/base/MKlib_gen.sh -+++ b/ncurses/base/MKlib_gen.sh -@@ -474,11 +474,22 @@ sed -n -f $ED1 \ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 <<EOF -+s/ / /g -+s/^ // -+s/ $// -+s/P_NCURSES_BOOL/NCURSES_BOOL/g -+EOF -+ -+# A patch discussed here: -+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html -+# introduces spurious #line markers. Work around that by ignoring the system's -+# attempt to define "bool" and using our own symbol here. -+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch b/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch deleted file mode 100644 index decdc2677904..000000000000 --- a/sys-libs/ncurses/files/ncurses-6.0-cppflags-cross.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/601426 -https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html - -From: John Vogel -Subject: [PATCH] c++ binding missed when cross compiling -Date: Mon, 16 Feb 2015 01:01:48 -0500 - -The configure script hard codes the include dir to the prefix'ed include dir, -when checking if c++ compiler works. This breaks the compiler's built-in search -path. I've included two patches. The first works on the configure.in file, which -requires your autoconf stuff to test and I'm not ready to meddle with at the -moment. The other works directly on the configure file. I've tested the second -one; it should mirror what the first patch tries to achieve and works for me. - ---- a/configure -+++ b/configure -@@ -2938,10 +2938,6 @@ - echo "$as_me:2938: checking if $CXX works" >&5 - echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 - -- save_CPPFLAGS="$CPPFLAGS" -- eval cf_includedir=${includedir} -- CPPFLAGS="$CPPFLAGS -I${cf_includedir}" -- - cat >conftest.$ac_ext <<_ACEOF - #line 2946 "configure" - #include "confdefs.h" -@@ -2978,7 +2974,6 @@ - cf_cxx_works=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- CPPFLAGS="$save_CPPFLAGS" - - echo "$as_me:2983: result: $cf_cxx_works" >&5 - echo "${ECHO_T}$cf_cxx_works" >&6 diff --git a/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch b/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch deleted file mode 100644 index 66345b51fe24..000000000000 --- a/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From be554be06475b36da2f69aabfd873ad55f7ef95c Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Thu, 13 Feb 2020 11:51:09 +0100 -Subject: [PATCH] Don't bleed user LDFLAGS into Libs - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - misc/gen-pkgconfig.in | 2 +- - misc/ncurses-config.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in -index 8f00b824..009d2156 100644 ---- a/misc/gen-pkgconfig.in -+++ b/misc/gen-pkgconfig.in -@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then - fi - - lib_flags= --for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ -+for opt in -L$libdir @LIBS@ - do - case $opt in - -l*) # LIBS is handled specially below -diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in -index 7f8ba697..2f1915cd 100644 ---- a/misc/ncurses-config.in -+++ b/misc/ncurses-config.in -@@ -101,7 +101,7 @@ fi - # There is no portable way to find the list of standard library directories. - # Require a POSIX shell anyway, to keep this simple. - lib_flags= --for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS -+for opt in -L$libdir $LIBS - do - case $opt in - -specs*) # ignore linker specs-files which were used to build library --- -2.25.0 - diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20211106.ebuild index 6353b40857d9..6c1bee312825 100644 --- a/sys-libs/ncurses/ncurses-6.2-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20211106.ebuild @@ -9,18 +9,47 @@ MY_PV="${PV:0:3}" MY_P="${PN}-${MY_PV}" DESCRIPTION="console display library" HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" +SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz + https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz + ftp://ftp.invisible-island.net/${PN}/${MY_P}.tar.gz" if [[ "${PV}" == *_p* ]] ; then - SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2 - https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2" + # Sometimes, after releases, there's no megapatch available yet. + # + # From upstream README at e.g. https://invisible-mirror.net/archives/ncurses/6.3/: + # + # "At times (generally to mark a relatively stable point), I create a rollup + # patch, which consists of all changes from the release through the current date." + # + # This array should contain a list of all the snapshots since the last + # release if there's no megapatch available yet. + PATCH_DATES=( + 20211026 + 20211030 + # Latest patch is just _pN = $(ver_cut 4) + $(ver_cut 4) + ) + + if [[ -z ${PATCH_DATES[@]} ]] ; then + SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.bz2 + https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.bz2" + else + patch_date= + for patch_date in "${PATCH_DATES[@]}" ; do + SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${MY_P}-${patch_date}.patch.gz" + SRC_URI+=" https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-${patch_date}.patch.gz" + done + unset patch_date + fi + + #SRC_URI+=" https://dev.gentoo.org/~polynomial-c/dist/${P}.patch.xz" fi LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="ada +cxx debug doc gpm minimal profile static-libs test tinfo trace" RESTRICT="!test? ( test )" DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" @@ -38,15 +67,14 @@ PATCHES=( "${FILESDIR}/${PN}-5.7-nongnu.patch" "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871 "${FILESDIR}/${PN}-6.0-pkg-config.patch" - "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 - "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 - "${FILESDIR}/${PN}-6.2-no_user_ldflags_in_libs.patch" + "${FILESDIR}/${PN}-6.2_p20210123-cppflags-cross.patch" #601426 ) src_prepare() { if [[ "${PV}" == *_p* ]] ; then - eapply "${WORKDIR}"/${P/_p/-}-patch.sh + #eapply "${WORKDIR}"/${P/_p/-}-patch.sh + eapply "${WORKDIR}"/ fi default } @@ -63,9 +91,9 @@ src_configure() { # checking configure flags. NCURSES_TARGETS=( ncurses - $(usex unicode 'ncursesw' '') - $(usex threads 'ncursest' '') - $(use unicode && usex threads 'ncursestw' '') + ncursesw + ncursest + ncursestw ) # When installing ncurses, we have to use a compatible version of tic. @@ -87,6 +115,7 @@ src_configure() { # We can't re-use the multilib BUILD_DIR because we run outside of it. BUILD_DIR="${WORKDIR}" \ + CC=${BUILD_CC} \ CHOST=${CBUILD} \ CFLAGS=${BUILD_CFLAGS} \ CXXFLAGS=${BUILD_CXXFLAGS} \ @@ -158,6 +187,7 @@ do_configure() { $(use_with trace) $(use_with tinfo termlib) --disable-stripping + --disable-pkg-ldflags ) if [[ ${target} == ncurses*w ]] ; then @@ -187,7 +217,7 @@ do_configure() { # Force bash until upstream rebuilds the configure script with a newer # version of autotools. #545532 - CONFIG_SHELL=${EPREFIX}/bin/bash \ + #CONFIG_SHELL=${EPREFIX}/bin/bash \ ECONF_SOURCE="${S}" \ econf "${conf[@]}" "$@" } @@ -248,8 +278,7 @@ multilib_src_install() { if multilib_is_native_abi ; then gen_usr_ldscript -a \ "${NCURSES_TARGETS[@]}" \ - $(use tinfo && usex unicode 'tinfow' '') \ - $(usev tinfo) + $(usex tinfo 'tinfow tinfo' '') fi if ! tc-is-static-only ; then # Provide a link for -lcurses. @@ -316,10 +345,10 @@ multilib_src_install_all() { pkg_preinst() { preserve_old_lib /$(get_libdir)/libncurses.so.5 - use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 + preserve_old_lib /$(get_libdir)/libncursesw.so.5 } pkg_postinst() { preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 - use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 + preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 } diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest index 2ba966e7eefc..3268392187b0 100644 --- a/sys-libs/openipmi/Manifest +++ b/sys-libs/openipmi/Manifest @@ -1,4 +1,8 @@ AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659945bd7d85758342438f261fedce67bace7795a74ff6010f68d04d8ae33936b6c60780986c9e0d66e93061577132f SHA512 2deae71fd039126cb3dd0a348658ddbf568345c782c2467a4712d36006217f86eaf86950c821d36a400aea4cf18409684e8abd3b1e504928f5bc6d4cf943c4bb DIST OpenIPMI-2.0.29.tar.gz 3119530 BLAKE2B 5c60b04e828699c396cb7ce29dca7665109d7b39c3d64535fafdca328c01eab0af9cc4d7fd1a30aa254836f6ce10a16e491fb7239777dc4d57edc65c20998504 SHA512 ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10 +DIST OpenIPMI-2.0.31.tar.gz 3129097 BLAKE2B 477d3c7abe0d04b3aa949b36c78ca149d92f4cea379e5be22a2718367f2fb3edac4d8487dd95bdf25b54b9c8c8d8d4ba1582b7bc65e416a8f1745b2790f405d7 SHA512 de1b364315e97daffb4c601bcf3bf33591795449d71690496ae368bd0730a117c1716508ecaddef5d55498f56e73481a32f509791185e80e2475667d7abd73e7 +DIST OpenIPMI-2.0.32.tar.gz 3140147 BLAKE2B 7f5d3f9e4a5a8388413d1cfb7d1b8bb1a46abce8404b408d4e505bb389e6f871b6f6d67560bcba9a5716dfcf95c5d3c27bbaf4a5fd7b924a629aa4546efde0c1 SHA512 e409f32e6bbf26756338ada386fa394d48d734b4d6ba4beca700ce60bc3af3d0f41e972a328c4e076ae014f4fbd8598d05d3f879f9c6d76198e6ae1a2ba03e95 EBUILD openipmi-2.0.29.ebuild 2293 BLAKE2B 4fba8429940cda4a1f2bdf55ef046f545ffea160458958a87462ea57d8a3c20c1581a82affa05c9465a4e76957f0533c7128d2f2b5a449664a78abe7749c8e44 SHA512 9923c48e19a9b0e452a50e2e1c24f92a8c2a398ed42dbe9d9691c2089f77341908271a410501776f53c8f459f113cfe5eb45cd17736856651a6ec4b0885de746 +EBUILD openipmi-2.0.31.ebuild 2298 BLAKE2B 214d64e21e1ac6b68a892ec56a54df0a3c2f9aee04135b1bb6448acd0b16eee6614142a1b95c1f3ec18117c808080aa6c91b6a3e687f2a506e6f21697d50f582 SHA512 3662ad02b70f70edfc122e3743ee80007d35177489875c6d127ef581e600308873872d76d709152d39635f4f97f3f8ba4dda747b4f03eeb52ae562d5e0ca2058 +EBUILD openipmi-2.0.32.ebuild 2298 BLAKE2B 214d64e21e1ac6b68a892ec56a54df0a3c2f9aee04135b1bb6448acd0b16eee6614142a1b95c1f3ec18117c808080aa6c91b6a3e687f2a506e6f21697d50f582 SHA512 3662ad02b70f70edfc122e3743ee80007d35177489875c6d127ef581e600308873872d76d709152d39635f4f97f3f8ba4dda747b4f03eeb52ae562d5e0ca2058 MISC metadata.xml 348 BLAKE2B 845b9eadd51770ff89268871a3cbb7befb724efeaa28b891e510f34f3bb80b8c72f937505b31646440da9581fa37a38f6272b37f424e78b9ff5c832c255e9bfc SHA512 c13f3458e198f1d4da1cf5be846df5d2cc2ca3ef3fecd5959f7fed0979f10d0eff326da380793dc4471d64e622a415ca60b144b92bb2889a0f870e0c2767f917 diff --git a/sys-libs/openipmi/openipmi-2.0.31.ebuild b/sys-libs/openipmi/openipmi-2.0.31.ebuild new file mode 100644 index 000000000000..c8b61d3259f7 --- /dev/null +++ b/sys-libs/openipmi/openipmi-2.0.31.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools python-single-r1 + +MY_PN="OpenIPMI" +MY_P="${MY_PN}-${PV/_/-}" +DESCRIPTION="Library interface to IPMI" +HOMEPAGE="https://sourceforge.net/projects/openipmi/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="crypt snmp perl python static-libs tcl" +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + sys-libs/gdbm:= + sys-libs/ncurses:0= + sys-libs/readline:0= + crypt? ( dev-libs/openssl:0= ) + snmp? ( net-analyzer/net-snmp ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + tcl? ( dev-lang/tcl:0= )" +DEPEND="${RDEPEND} + >=dev-lang/swig-1.3.21" +BDEPEND="virtual/pkgconfig" + +# Gui is broken! +# python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.26-tinfo.patch" #501510 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Bug #298250: parallel install fix. + sed -r -i \ + -e '/^install-data-local:/s,$, install-exec-am,g' \ + cmdlang/Makefile.{am,in} || die + + # We touch the .in and .am above because if we use the below, the Perl stuff + # is very fragile, and often fails to link. + eautoreconf +} + +src_configure() { + local myconf=( + # these binaries are for root! + --bindir="${EPREFIX}"/usr/sbin + --with-glib + --with-glibver=2.0 + --with-swig + --without-tkinter + $(use_with snmp ucdsnmp yes) + $(use_with crypt openssl yes) + $(use_with perl perl yes) + $(use_with tcl tcl yes) + $(use_with python python yes) + ) + + # GUI is broken + #use tk && use python && use !tcl && \ + # ewarn "Not building Tk GUI because it needs both Python AND Tcl" + #if use python && use tcl; then + # myconf+=( $(use_with tk tkinter) ) + #else + # myconf+=( --without-tkinter ) + #fi + + econf "${myconf[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm + newdoc cmdlang/README README.cmdlang + + use python && python_optimize + + find "${ED}" -name "*.la" -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/sys-libs/openipmi/openipmi-2.0.32.ebuild b/sys-libs/openipmi/openipmi-2.0.32.ebuild new file mode 100644 index 000000000000..c8b61d3259f7 --- /dev/null +++ b/sys-libs/openipmi/openipmi-2.0.32.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools python-single-r1 + +MY_PN="OpenIPMI" +MY_P="${MY_PN}-${PV/_/-}" +DESCRIPTION="Library interface to IPMI" +HOMEPAGE="https://sourceforge.net/projects/openipmi/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="crypt snmp perl python static-libs tcl" +RESTRICT="test" + +RDEPEND=" + dev-libs/glib:2 + sys-libs/gdbm:= + sys-libs/ncurses:0= + sys-libs/readline:0= + crypt? ( dev-libs/openssl:0= ) + snmp? ( net-analyzer/net-snmp ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + tcl? ( dev-lang/tcl:0= )" +DEPEND="${RDEPEND} + >=dev-lang/swig-1.3.21" +BDEPEND="virtual/pkgconfig" + +# Gui is broken! +# python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.26-tinfo.patch" #501510 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Bug #298250: parallel install fix. + sed -r -i \ + -e '/^install-data-local:/s,$, install-exec-am,g' \ + cmdlang/Makefile.{am,in} || die + + # We touch the .in and .am above because if we use the below, the Perl stuff + # is very fragile, and often fails to link. + eautoreconf +} + +src_configure() { + local myconf=( + # these binaries are for root! + --bindir="${EPREFIX}"/usr/sbin + --with-glib + --with-glibver=2.0 + --with-swig + --without-tkinter + $(use_with snmp ucdsnmp yes) + $(use_with crypt openssl yes) + $(use_with perl perl yes) + $(use_with tcl tcl yes) + $(use_with python python yes) + ) + + # GUI is broken + #use tk && use python && use !tcl && \ + # ewarn "Not building Tk GUI because it needs both Python AND Tcl" + #if use python && use tcl; then + # myconf+=( $(use_with tk tkinter) ) + #else + # myconf+=( --without-tkinter ) + #fi + + econf "${myconf[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm + newdoc cmdlang/README README.cmdlang + + use python && python_optimize + + find "${ED}" -name "*.la" -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest index fb0133441314..5c3bb8fe0271 100644 --- a/sys-libs/pam/Manifest +++ b/sys-libs/pam/Manifest @@ -6,5 +6,6 @@ DIST pam-1.5.1_p20210622.tar.gz 783068 BLAKE2B c8f13c2ccef73ad367d4fac9a7d1d0d3f DIST pam-doc-1.5.1_p20210610.tar.xz 62308 BLAKE2B b3311e704ddc840b7fd28ea7764e8a0d3fdf508e2e37405acbfa26462a188c480859b3b21bd4a4b4acea70928e68650c216e8fb2d2b6f11ba33f54c6692cf3a2 SHA512 89b88f8ebf0c46f6b25dc0c5f39383ecbef0b12d6ffab388d92026066ee986f9068819cdbf38baaa1e341cd6cc84b1e8d3ad02db121aaf0ddad27e4e6efe26e7 EBUILD pam-1.5.1-r1.ebuild 3735 BLAKE2B fc8117f4944953f158801b726d47f054c31eec241878de7d8ec88dc483653d27c57ddbbeccc0c4b2be4d5b08c639f1de3ef81ca9193470ed5ed83fd40470f8f2 SHA512 805f9d2e9f5b77456f1ad03a3caf35feee6cf193eaa123288ad5d7981fb8a967a62a7cf771dcc93d658ead4f20992bd3901983d7cdebe753701bc34ce115e80d EBUILD pam-1.5.1_p20210622-r1.ebuild 3606 BLAKE2B a7e90212959cad24b0422e5b1b884973f70d5626cfc1fcd6f907211afa47046ea76075aa72706fc0c1c13dc4b02325961ad8a195b614f8d0ae7a7f66318c9f6b SHA512 9806f6584615743dc1c34ff4a5179a0a7070693e067b081585dea4210445d8f15695a2f5ae34d7595e87d20bc8dfa7d1c085d00248dad7e600ac9d9d759c2862 +EBUILD pam-1.5.2-r1.ebuild 3477 BLAKE2B 5617b1062f41296e18e2d874869961d0dcb8bc1e3c0dd3b9560c8bf5f42a3760028f07585078f0e83579293c712ddff6e5e463e13cdcd259715fe885df0d3225 SHA512 0bffbd09cf6f5d0f4b4f3a294c325763fc12fa42897325acdee927b739790bd5925df234ad2b0c8e8749dd1c7d6be6df19b214820045efc14050920a06a05cdb EBUILD pam-1.5.2.ebuild 3530 BLAKE2B 77fc1e28dbc42a7b8b88e3d164d29c41668a6317e31dac0ef86f045bc21f454965a98a8389d9f41b84a623c42cd63a0fee0fbc7fa22f6c33935f217055035efb SHA512 f2568902707ce78f3385a301dc8b3bc04ae1b2f334e5a70f99941405b3d6e25ead0855211f2bd9c3a4696935d0626a9900dcf3d70fefbb53191d013888670a75 MISC metadata.xml 754 BLAKE2B 366be10dfcad98d08ea3e307312b9a84804efa6f097f1505907e03fcb5fd0f4a6067d1d85d8dc5fec82c54c2e1fdf76d716d09a45571b0994d96130a2506e1f5 SHA512 b453a62fc3cdc6c0e7cd9c15d1bf72f8641a8eefc3971304ae5f0db3c93b69ca5f9c059e70b94ce799b15b640831c8832707fc1740f1361aca3a28c30ae8f366 diff --git a/sys-libs/pam/pam-1.5.2-r1.ebuild b/sys-libs/pam/pam-1.5.2-r1.ebuild new file mode 100644 index 000000000000..77719a8fded9 --- /dev/null +++ b/sys-libs/pam/pam-1.5.2-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="Linux-${PN^^}-${PV}" + +# Avoid QA warnings +# Can reconsider w/ EAPI 8 and IDEPEND, bug #810979 +TMPFILES_OPTIONAL=1 + +inherit autotools db-use fcaps toolchain-funcs multilib-minimal + +DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" +HOMEPAGE="https://github.com/linux-pam/linux-pam" + +SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}.tar.xz + https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}-docs.tar.xz" + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="audit berkdb debug nis selinux" + +BDEPEND=" + dev-libs/libxslt + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + virtual/yacc +" + +DEPEND=" + virtual/libcrypt:=[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] + audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ) + berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + nis? ( net-libs/libnsl:=[${MULTILIB_USEDEP}] + >=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}] )" + +RDEPEND="${DEPEND}" + +PDEPEND=">=sys-auth/pambase-20200616" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + touch ChangeLog || die + eautoreconf +} + +multilib_src_configure() { + # Do not let user's BROWSER setting mess us up. #549684 + unset BROWSER + + local myconf=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + --with-db-uniquename=-$(db_findver sys-libs/db) + --with-xml-catalog=/etc/xml/catalog + --enable-securedir=/$(get_libdir)/security + --includedir=/usr/include/security + --libdir=/usr/$(get_libdir) + --enable-pie + --enable-unix + --disable-prelude + --disable-doc + --disable-regenerate-docu + --disable-static + --disable-Werror + $(use_enable audit) + $(use_enable berkdb db) + $(use_enable debug) + $(use_enable nis) + $(use_enable selinux) + --enable-isadir='.' #464016 + ) + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + emake sepermitlockdir="/run/sepermit" +} + +multilib_src_install() { + emake DESTDIR="${D}" install \ + sepermitlockdir="/run/sepermit" +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + + # tmpfiles.eclass is impossible to use because + # there is the pam -> tmpfiles -> systemd -> pam dependency loop + + dodir /usr/lib/tmpfiles.d + + cat ->> "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_ + d /run/faillock 0755 root root + _EOF_ + use selinux && cat ->> "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_ + d /run/sepermit 0755 root root + _EOF_ + + local page + + for page in doc/man/*.{3,5,8} modules/*/*.{5,8} ; do + doman ${page} + done +} + +pkg_postinst() { + ewarn "Some software with pre-loaded PAM libraries might experience" + ewarn "warnings or failures related to missing symbols and/or versions" + ewarn "after any update. While unfortunate this is a limit of the" + ewarn "implementation of PAM and the software, and it requires you to" + ewarn "restart the software manually after the update." + ewarn "" + ewarn "You can get a list of such software running a command like" + ewarn " lsof / | egrep -i 'del.*libpam\\.so'" + ewarn "" + ewarn "Alternatively, simply reboot your system." + + # The pam_unix module needs to check the password of the user which requires + # read access to /etc/shadow only. + fcaps cap_dac_override sbin/unix_chkpwd +} diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest index acc1d3858be7..400ac7f5f996 100644 --- a/sys-libs/tdb/Manifest +++ b/sys-libs/tdb/Manifest @@ -1,7 +1,3 @@ -DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a -DIST tdb-1.4.4.tar.gz 714367 BLAKE2B fdd84fc76a428b3b98ca481a9ef42c46d21f67f6ca8d92a90e6f0c1d24aa8f1f3b773c8fdcb43b572f8a1441349af491cb5d4ad9440d0b95fb51b89591510e27 SHA512 ef0a997aacebcc804e84ec4a14de8189513ddd1083ba677e421269c21a94f5ca8fc188185645855e5ef81417f4843c8649417ff28f286b768d690907d5d4cb07 DIST tdb-1.4.5.tar.gz 729650 BLAKE2B 5d8a226cf251268d70f68759fb792628559fa3b10e7843d1a53914ea24f0ceca61fe0c3f348d704ebc8df4c56fe2365690b585b1c96cf53d63ecae1960aca58a SHA512 373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56 -EBUILD tdb-1.4.3.ebuild 1390 BLAKE2B dd53828ff444e148af6dca3f49e3ebda352539e6d6eefa343150159d856ac7c3696e7974a479f4b5aeff96bae69dc66b89c0b57a0b132a772531787ec7c7b8cb SHA512 be7b77a732c8d106dc013e7a1d3b4c51f0c0226cad7fccd14c3886e91ada643bc9c5adf1549315ce008ffc45c2d3191ada3d47ad47accdd99753365f907f2fc7 -EBUILD tdb-1.4.4.ebuild 1405 BLAKE2B 8290e5e8a488deeb14238ed5be795b8a763922339448fd62b21f8a6627dce6a58535acee7a0b0e1137477cb8d53fcd530e63b718526227db91438c75893243fc SHA512 b00e032edab9c0392d782e6c3ffcea779fe01363531b7573e664437a5f56054726a645f510669b35f2fc51d09ec744a1e15436d15415546bacf65ee0eb3a5515 -EBUILD tdb-1.4.5.ebuild 1408 BLAKE2B 2ec38b7690806d497389da51f546a82b87faad2cec2015329dcb51e16698d601753b11ac26c8fa5fea67a74f39a80ebc461c747f908efa010ad6f8b54dc69a21 SHA512 8ec3d31c91f162d35375bdb227e8dfe5b55052debba51108ed55b983e888210f5d2af872be73c2eceab82916747d70309b903e3bcf70de4679972cd8a4511bb9 +EBUILD tdb-1.4.5.ebuild 1426 BLAKE2B c3033fcbced067a780f55f36b09f1f7477cc694b1281cca45e99b6eb49e7679b47f1057ad897b25f5f7e51db68b56f7347bcc4c9898662b974d7c8944b07e830 SHA512 beed1acd66229c2da687764678f4b11778ed4503ace665036cf79eaea157434914a28d338056e634864d07aa8209f20106302e3ceb11e26a8e38d341c93a0e75 MISC metadata.xml 245 BLAKE2B 015a6303c153dcdb4a4b6ec58ea97e6798d3316c6d211559022bd2a26d481356e481ba2ade200171bb182264ce9c132727cf8ce077fba38fabcef92c3431b6ba SHA512 5d1b6ef089165b3325df35b31d33f7c994bbc302399bb47abf3138885f0dd7b04176114de8ffea6ee1ae26a53fc83be9016426714e547fd6405c454b918e39da diff --git a/sys-libs/tdb/tdb-1.4.3.ebuild b/sys-libs/tdb/tdb-1.4.3.ebuild deleted file mode 100644 index 34c29792999c..000000000000 --- a/sys-libs/tdb/tdb-1.4.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="threads(+)" -inherit waf-utils multilib-minimal python-single-r1 - -DESCRIPTION="Simple database API" -HOMEPAGE="https://tdb.samba.org/" -SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" - -RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.2 -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -src_prepare() { - default - python_fix_shebang . - multilib_copy_sources -} - -multilib_src_configure() { - local extra_opts=() - if ! multilib_is_native_abi || ! use python; then - extra_opts+=( --disable-python ) - fi - - waf-utils_src_configure "${extra_opts[@]}" -} - -multilib_src_compile() { - # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses - unset MAKEOPTS - waf-utils_src_compile -} - -multilib_src_test() { - # the default src_test runs 'make test' and 'make check', letting - # the tests fail occasionally (reason: unknown) - emake check -} - -multilib_src_install() { - waf-utils_src_install -} diff --git a/sys-libs/tdb/tdb-1.4.4.ebuild b/sys-libs/tdb/tdb-1.4.4.ebuild deleted file mode 100644 index 187196ce6f7e..000000000000 --- a/sys-libs/tdb/tdb-1.4.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="threads(+)" -inherit waf-utils multilib-minimal python-single-r1 - -DESCRIPTION="Simple database API" -HOMEPAGE="https://tdb.samba.org/" -SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" - -RDEPEND=" - !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.2 -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -src_prepare() { - default - python_fix_shebang . - multilib_copy_sources -} - -multilib_src_configure() { - local extra_opts=() - if ! multilib_is_native_abi || ! use python ; then - extra_opts+=( --disable-python ) - fi - - waf-utils_src_configure "${extra_opts[@]}" -} - -multilib_src_compile() { - # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses - unset MAKEOPTS - waf-utils_src_compile -} - -multilib_src_test() { - # the default src_test runs 'make test' and 'make check', letting - # the tests fail occasionally (reason: unknown) - emake check -} - -multilib_src_install() { - waf-utils_src_install -} diff --git a/sys-libs/tdb/tdb-1.4.5.ebuild b/sys-libs/tdb/tdb-1.4.5.ebuild index b0e4e366e9ec..2e3e41f8dbaa 100644 --- a/sys-libs/tdb/tdb-1.4.5.ebuild +++ b/sys-libs/tdb/tdb-1.4.5.ebuild @@ -21,7 +21,8 @@ RESTRICT="test" RDEPEND=" !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/libcrypt" BDEPEND="${PYTHON_DEPS} app-text/docbook-xml-dtd:4.2" |