diff options
Diffstat (limited to 'sys-libs')
76 files changed, 1396 insertions, 2208 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex b4e4fa10ddfc..7b188893d247 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 c57ec965efbe..7c6ede9a0d6f 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -5,9 +5,11 @@ DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b 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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 +DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e EBUILD compiler-rt-sanitizers-10.0.1-r1.ebuild 4513 BLAKE2B be188f8bef66099999a98b033ff18f132a1697beb8606f44a7bcaacabff7123439b09e4a34e03be51eebba4b4059461b5953888a99753fa7c58dab7ae3f89337 SHA512 97bb314099bdc4b4f237eca31da1d0ac5bf548c05a2691fa0c6c5308979fd654649ccf8e121cb1529b6261bd1045d55ca6e0bd851d3b8896d46f13f8becee821 EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6036 BLAKE2B 0b573d9345f36f750283574bd5f2efe8d60ced8448a700b3571a2303a26a79fa1240c6347d28ba810f7619afc58afcd3e369b2a7769b3a2ebc303919701eddbe SHA512 960d2f6ee96dcefbe3cb9b6637676cc1f16cbb2904bb6913b6d1807afae61229d7774bebe0d3e50fff62bf7fcf5c289ad8b7a5c614ae2589b9b3c891103606ef -EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 5885 BLAKE2B 7369edb9da3e3915eb72e684efa29e7a9b895211f400c8e2957495eff732afcf33d3b9a2d2a86fcfd973958eb7a9e5c49269b1221a7c30c5736d2dd284738445 SHA512 85df50370833bff9c73ebb6d11307349f6a437fd673aef608aa525fdf766f71debccc5ff0959253fc9f662050e727859625ce75cbee2e5084deaa07fcfe67d8a EBUILD compiler-rt-sanitizers-12.0.0.ebuild 6085 BLAKE2B 4571a815cf55d95ad179e22ae351163e4df99634db9b89217b1ba17281b4945521bb99f03934fc97385d2854902dcd606939c4219a633935f78673c2475cbe9c SHA512 650437aa5152276a2cedfe8dbb2e1a43405f134702670f94f0434f54ccd837a5ec062417c7536581e9778a12012724872f4eaa9fbae5d2e51645d8016d39d262 +EBUILD compiler-rt-sanitizers-12.0.1.9999.ebuild 5885 BLAKE2B 7369edb9da3e3915eb72e684efa29e7a9b895211f400c8e2957495eff732afcf33d3b9a2d2a86fcfd973958eb7a9e5c49269b1221a7c30c5736d2dd284738445 SHA512 85df50370833bff9c73ebb6d11307349f6a437fd673aef608aa525fdf766f71debccc5ff0959253fc9f662050e727859625ce75cbee2e5084deaa07fcfe67d8a +EBUILD compiler-rt-sanitizers-12.0.1_rc1.ebuild 5885 BLAKE2B 7369edb9da3e3915eb72e684efa29e7a9b895211f400c8e2957495eff732afcf33d3b9a2d2a86fcfd973958eb7a9e5c49269b1221a7c30c5736d2dd284738445 SHA512 85df50370833bff9c73ebb6d11307349f6a437fd673aef608aa525fdf766f71debccc5ff0959253fc9f662050e727859625ce75cbee2e5084deaa07fcfe67d8a EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5885 BLAKE2B 7369edb9da3e3915eb72e684efa29e7a9b895211f400c8e2957495eff732afcf33d3b9a2d2a86fcfd973958eb7a9e5c49269b1221a7c30c5736d2dd284738445 SHA512 85df50370833bff9c73ebb6d11307349f6a437fd673aef608aa525fdf766f71debccc5ff0959253fc9f662050e727859625ce75cbee2e5084deaa07fcfe67d8a MISC metadata.xml 1341 BLAKE2B 27ba2b57b7ba21538680b5535aec8b0e8e772a040b25ac8c9285765ed00a485a01ce6dd47c32686c7d162d072f4d6d7d2e1a790e9bd867b61a460b01ad79bade SHA512 909a922e1b0e9649534d88bb7692b1d1d7a9d3d539a4926054dac834d672da065cfea5b2aab02dd23f2a7b0dde0eb0b10ae453990c3ecf99ec20f6a2d2bdbac6 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.9999.ebuild index e96a02172283..e96a02172283 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.9999.ebuild diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc1.ebuild new file mode 100644 index 000000000000..e96a02172283 --- /dev/null +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1_rc1.ebuild @@ -0,0 +1,200 @@ +# 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/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="$(ver_cut 1-3)" +KEYWORDS="" +IUSE="+clang test elibc_glibc" +# base targets +IUSE+=" +libfuzzer +memprof +profile +xray" +# sanitizer targets, keep in sync with config-ix.cmake +# NB: ubsan, scudo deliberately match two entries +SANITIZER_FLAGS=( + asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo + shadowcallstack gwp-asan +) +IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" +REQUIRED_USE=" + || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) + test? ( + cfi? ( ubsan ) + gwp-asan? ( scudo ) + )" +RESTRICT="!test? ( test ) !clang? ( test )" + +CLANG_SLOT=${SLOT%%.*} +# llvm-6 for new lit options +DEPEND=" + >=sys-devel/llvm-6" +BDEPEND=" + >=dev-util/cmake-3.16 + 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}" + +LLVM_COMPONENTS=( compiler-rt ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +LLVM_PATCHSET=9999-1 +llvm.org_set_globals + +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 + + local flag + for flag in "${SANITIZER_FLAGS[@]}"; do + if ! use "${flag}"; then + local cmake_flag=${flag/-/_} + sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \ + cmake/config-ix.cmake || die + fi + done + + # TODO: fix these tests to be skipped upstream + if use asan && ! use profile; then + rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die + fi + if use ubsan && ! use cfi; then + > test/cfi/CMakeLists.txt || die + fi + + 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 flag want_sanitizer=OFF + for flag in "${SANITIZER_FLAGS[@]}"; do + if use "${flag}"; then + want_sanitizer=ON + break + fi + done + + 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_MEMPROF=$(usex memprof) + -DCOMPILER_RT_BUILD_PROFILE=$(usex profile) + -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}" + -DCOMPILER_RT_BUILD_XRAY=$(usex xray) + + -DPython3_EXECUTABLE="${PYTHON}" + ) + 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+=( + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch + # this allows adding arm64 support using SDK in EPREFIX + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk" + # Set version based on the SDK in EPREFIX + # This disables i386 for SDK >= 10.15 + # Will error if has_use tsan and SDK < 10.12 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')" + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" + ) + 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/Manifest b/sys-libs/compiler-rt/Manifest index 85d3fc133cb0..a88cfbf61460 100644 --- a/sys-libs/compiler-rt/Manifest +++ b/sys-libs/compiler-rt/Manifest @@ -5,9 +5,11 @@ DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b 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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 +DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e 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.0.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d EBUILD compiler-rt-12.0.0.ebuild 3545 BLAKE2B 98aa5cd6f5ad6f5570d432811731dc96ed330f7d923628edbf5fd58a24f28f2c70c5e7ef912f5c367c0de6a38e4b06cca4bfc8f412f377d507e64df611757ffd SHA512 e4345c91a92b697641eeb621102a35d287c8c690eba039a160f98ef12f93f33bcf1d35f5f3c6341eb07be62678a601567152cc908786fb3d4f70995fe94ace58 +EBUILD compiler-rt-12.0.1.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d +EBUILD compiler-rt-12.0.1_rc1.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d EBUILD compiler-rt-13.0.0.9999.ebuild 3471 BLAKE2B d45d3843d7a644b4b9739c3b0db74b102235b2c418ceb7cf13410bef9fec17cebbdad0fec1563cb3b5122db96ccca520e13acd7967027b466a315f23147ed57a SHA512 bb3e2c1c852e5182f73b9a22a13fe5013adabaf34526be7e775412caaae078b6b81d9a66db38b3f0ccf61bed72b52f94ddca793f257d91de1a31e400a45fa23d MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1.9999.ebuild index caf0b9268efd..caf0b9268efd 100644 --- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-12.0.1.9999.ebuild diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc1.ebuild new file mode 100644 index 000000000000..caf0b9268efd --- /dev/null +++ b/sys-libs/compiler-rt/compiler-rt-12.0.1_rc1.ebuild @@ -0,0 +1,124 @@ +# 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/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="$(ver_cut 1-3)" +KEYWORDS="" +IUSE="+clang test" +RESTRICT="!test? ( test ) !clang? ( test )" + +CLANG_SLOT=${SLOT%%.*} +# llvm-6 for new lit options +DEPEND=" + >=sys-devel/llvm-6" +BDEPEND=" + >=dev-util/cmake-3.16 + 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}" + +LLVM_COMPONENTS=( compiler-rt ) +LLVM_PATCHSET=9999-1 +llvm.org_set_globals + +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() { + # Darwin Prefix builds do not have llvm installed yet, so rely on + # bootstrap-prefix to set the appropriate path vars to LLVM instead + # of using llvm_pkg_setup. + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then + llvm_pkg_setup + fi + 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_MEMPROF=OFF + -DCOMPILER_RT_BUILD_PROFILE=OFF + -DCOMPILER_RT_BUILD_SANITIZERS=OFF + -DCOMPILER_RT_BUILD_XRAY=OFF + + -DPython3_EXECUTABLE="${PYTHON}" + ) + + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then + mycmakeargs+=( + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch + # this allows adding arm64 support using SDK in EPREFIX + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk" + # Set version based on the SDK in EPREFIX. + # This disables i386 for SDK >= 10.15 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')" + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" + ) + 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/cracklib/Manifest b/sys-libs/cracklib/Manifest index 0118c7e3398e..f3a20e099724 100644 --- a/sys-libs/cracklib/Manifest +++ b/sys-libs/cracklib/Manifest @@ -1,3 +1,3 @@ DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2 -EBUILD cracklib-2.9.7.ebuild 2541 BLAKE2B d30bbaecdb610d98d794ad2fa06f3d3eff5099dabfa6e6eb1e1c60c0fc30c59b7a5faa0b3dd1cc665ac21d9d092b31da0c299b69889de40d08eb25c8455dc927 SHA512 2408b3ed8a4942a38f4443724d1ecdede5aa9cff59211f720ae77a6aa4abd6fb17a9a4d95a0638f92ae9a9a08633c58ab64a95d44400fbc0e843d42e0ded106c +EBUILD cracklib-2.9.7.ebuild 2606 BLAKE2B 94554367a34bcd0924abd1a054e64408b605b43ecf904d6e72527612ec485ecd8cb03d9b664372a603e132d32facbbe63f40ca85c74f0206e455ff063672de23 SHA512 c65aad0170ff3b3ac58c30805d6816de1ad1df8174bfb390d6b04117e2761d7e04693fe1d07068831625ae9382b59b39c521e4f27882f5f22a7a275733fac66f MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1 diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild index 84d00baa24db..b2cada86052b 100644 --- a/sys-libs/cracklib/cracklib-2.9.7.ebuild +++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild @@ -5,7 +5,7 @@ EAPI=7 # Note: ideally bump with sys-apps/cracklib-words -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 libtool multilib-minimal usr-ldscript @@ -24,9 +24,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="python? ( ${PYTHON_DEPS} ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} + nls? ( virtual/libintl ) python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" +BDEPEND="nls? ( sys-devel/gettext )" S="${WORKDIR}/${MY_P}" diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index f617602743a8..f50c54708206 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -70,18 +70,12 @@ EBUILD db-3.2.9_p2-r2.ebuild 4899 BLAKE2B e1d4e490297d6b67a5eb6256dbcece49145e4d EBUILD db-4.2.52_p5-r4.ebuild 4640 BLAKE2B 75d2682fa7ba0276391079b38ee7b7f2809de12d65d344ebe0a9972eaa2aeaac86a2600be95aabbe37de8f08a6ab9f59c2d8c822141d5c79ca5f2e0abead9be9 SHA512 ee4349300aa26b0456f3d4cc959c4a0285df699ee723f1e6393c667689ed25bf6e0e0db4836ac8a4c7ee65e20331b385c4b3411aaca1fba9b8442b406c2627e4 EBUILD db-4.3.29_p1-r4.ebuild 4510 BLAKE2B 35b4742c38626b3caaafc16c4424321ca603b7fcf1c3e987d983e6e17d124e8008922a2987c05439c2628d94918251204d17bde5cf45a9e0dae30c5a10c1f4f4 SHA512 144c0095632395b6ab7f9279f4e00f40a7f823fdefa28f39ee54cc4019c631b91e3f2e1da8bd9d7afe46378647424a29c86356fd27394d1e19be53ced97038a3 EBUILD db-4.4.20_p4-r4.ebuild 4398 BLAKE2B db3ddc7a2b706889692d2c06063215128cc71da6b6ecd4488a87c8b363f6b26bb3f795df602ad1b19202d930f9e2bc0eb9b5ef9d0fad3e7b896ff99fe60d0826 SHA512 219b0d8fd4e8c12a59d5856f71b6dd3f8b6b53229ea86b774967a5c082715e215ac73962a747802f1804b30d152581434d2a75c4521b84483f688c2871b69a21 -EBUILD db-4.5.20_p2-r5.ebuild 4638 BLAKE2B bb3dcfd57bbd3be6e6d0a199f83a46d6ad709665100aad59854cd7914bec63fbe16fb76945d2f0ea6ec5fdc8d5215b27e72d7e6a2ec520eeeff257ea5f4bfd5d SHA512 0a0d8b5cf67fe9073331e14f4402a1eeaa2e274f2459291c76f52ab4fd5f566301919bab26688a30e49504c85b1f6e643a11c0464ab9378c2c778ada4537c21d -EBUILD db-4.5.20_p2-r6.ebuild 4730 BLAKE2B 5fbdec2c6b458eb55916d529917f89bb7ae25a47e0b04098984c5f241f185aa3506f03d0382fc89c40d44b7746dc65801c9b81711735d817bbe2de0547203544 SHA512 0ab94fd004a83a947e71d0d99f2c7edb5a3c6ed7159d2db01ad7664dfdb8547b20fb2e4a6127294ab37799db96ad4093d914a58b457e6a4deb518b7004ed906e -EBUILD db-4.6.21_p4-r4.ebuild 4360 BLAKE2B 1bd0a69c3f1f099f96471b9f8633db6847096d55aca14862e1136d59efba1557958ebf5af2b7aa6d32e93d1aec1da32c11ac70b96180fdd586fffff1f28a8379 SHA512 cbb70c4687aae61ed8c8c523cedb60cdd7664e1fd62b2d8d171758fe08611dd01483e573ba44a90594d9090c8adaa0246ddd95600e670ce211f5c3b54555e138 -EBUILD db-4.6.21_p4-r5.ebuild 4452 BLAKE2B 16af0a958c82ce5dbe764803d14600733623d2c3cb1db83d0809c86f8843f66d159398cf0423347f84838d4f07c27c925eb8f15560f3d1b6d949563d5b7924f0 SHA512 c9c3ab66ecbcd50feecbde59090c970319062fa61e9447500a9c2a0c4f689abb58039b6f9df369ca8c0c7921f394cf74998de2440644e5aad0dbd97cc14bb7d7 -EBUILD db-4.7.25_p4-r4.ebuild 4686 BLAKE2B 452bc3e8e62c91843a58a69e77d4678daf23a749124f54aeff0b7bc20bd621d008cdeb79e21db92a4a072c7df67e7631d27e1868930222896ce3b44ed8298038 SHA512 ef7db867c191686d9ad538b12df98bab7c4c56d0a26a3b1bbb17051208f0163645566aa76bf98de95b92fe788540e81b697b747818f1e82220a1f4f407049678 -EBUILD db-4.7.25_p4-r5.ebuild 4778 BLAKE2B 49a5cdb4883142aedd0587e5940d117a614e71faf375df75b37971466e8b97de5f94ce074838fe250cbacb38fe2e1aaf522efc765ca2b84ff0269bd9d2fa4f5f SHA512 3500e60bdddd264d8ffac7a808ab0ee17bddad7f01e737bd3913c661270dc8e2a7410b806b453159b9f7697cfe27f2d21924524ad5e796a6b3f4a50770316ff4 -EBUILD db-4.8.30-r5.ebuild 5182 BLAKE2B f977515df746d0c59fa2914f33b4b9e53c80d0085da522b2f547101a72524a784de854561b4d6b065f8cb2c4d7e228bd85bd073bed0c618ee0185df7802f4767 SHA512 2efd06d524a24846f50363311aa3957a6b1ad5fe6816d44343d303d41673922cced9acc1cf418fd72a4802c3eef9e2434559965aaa61853e8182ea52d1e5376b -EBUILD db-4.8.30-r6.ebuild 5274 BLAKE2B 1ab6c49e551eed1889424b87ba7d9bfd033cf29ea281dcb8683a94076e821edbb1badddffd9ea5751b9e580a9e4a6ddbd157b0b14f703f17fa730a1a3bc31365 SHA512 3e76acc49b757b3a67c7852b4cb0fb9476afcb926f1ba828d253933e3cfe5fbf0b1c81fed66850f0b667aef132eb917bf921fa605dcc95f7a93c8fb2e1d730fb +EBUILD db-4.5.20_p2-r6.ebuild 4723 BLAKE2B 09f498e00ce1ec2ba06bb563cbcd8dd9ae9412643c64f4d38104150dfc8eacd6f8602a018171824193e50ac7636205d60f96b7f361b893429a84fde9bee481c3 SHA512 a5655647f8b98a0c5f91498af16c7d710ff91869732c996bc089c1cd4a341e1ff7c8b52df165be184f289ac09999284fa446f11e3d055fc009f247e013d5fbfa +EBUILD db-4.6.21_p4-r5.ebuild 4445 BLAKE2B 74a4d54a85e51ad598ad0ef239534d65af5b7823241101c5122d4dca2659cacf32c49fb7e72ae35b6a2e179d16496345bd01a7512073a60e9a153bdfc2f4ecc8 SHA512 ae7cf9f1f7ca69a6100a5dd8cc5af16477b7493329578773ee47935b84bd515acf806d95212bc31b6b99a4db5106544b43802ddd494488d381afb380155cbcea +EBUILD db-4.7.25_p4-r5.ebuild 4771 BLAKE2B 336762b8f1ae4b2bf8090b078d9dea2c758435bb7142112bfce7217ebbf83dd1c82ef3ea1ff70194d04f237b22981fbb3f4ed3d8dce227f183b8e13f4d6b8a88 SHA512 308946ce92bf5b11f5321b1fece8c4d6e69405bb212ee2c3338076a6abb65d2e8d04e7aab3ab32d597692794d6e6acbb548b6724cc626fc43363e31356b609f9 +EBUILD db-4.8.30-r6.ebuild 5267 BLAKE2B 58c9c2c1abc102f940f7b86ad6b513350ad5532a81d0a4bb6288fe3a8529b4242d31426f6b58e8a31a6064990f7a28b8808612518676ea489759ecbc911e64f9 SHA512 377c4d4a0bf93d0b0de80fc1bd52bfd9487846e2fff5ce38b372175aadd2452fd16c507eead847d05056d7bb9e8af1d0d97a446c09554cef62bd8942ab0ece9e EBUILD db-5.1.29-r3.ebuild 5828 BLAKE2B c6c95e2ca50f73ac706130c111c3e6522cc7472ea34add7c7edac1578a872a6660fb7d5621051f8cd2cc04d165ee9667fd1ce3785c870602347f934832e824ff SHA512 ccab98198f26be0be79b82c715cd6f773f246af4c8cb61150c5af25ae954fc0e48d5aeec26309dbe5669b0fd1ed516f7e56f42d49fbba6012e0e466e24e9071b -EBUILD db-5.3.28-r6.ebuild 7139 BLAKE2B 508d61e239e3c06b2f3f44fb785bb422730c3a4e556d5551def14a6415a6448892dca5579bfa9f800c2a5f4c2963951312491a43f462249f3be0e371ae1039cf SHA512 df7c1cb37380acd7cf7f0ad61a80d95749c677cade232578a6a76fc5aa5170bdff273d419145ca29ecb788739c3818d4ee31b905ea3edf7beceddb66dcbcdd61 -EBUILD db-5.3.28-r7.ebuild 7107 BLAKE2B f12a047d497b4f97aadaa6793fc44b6a0cde50a2c57dadc915758e0960fe6e7dcc91b55c0c108d8446d3f8792d47a8197be7a8cf022be99c702d70e395f15370 SHA512 db7f69e1f612211ce4611b986a06a05c5b7e5dfde66c4bf24647ebdad98d76f7582297d79aa6f3fe57f1ace72ba28346d71079dcb2cf18e9a97154f4b9fd616f -EBUILD db-5.3.28-r8.ebuild 7198 BLAKE2B c53c9450e0068917f70ed7bb37fc53e68310494e50f2099228311cbfd1c06dd39e7ac14604a10f06c63d947e420c6d68195e19e7983bd00090e8a98d7f20963d SHA512 af99d2b29a4ddd538228ef6319f502a1634a0c8b4cc31b262616a4f4b458ebafe32b4f086e29ac07fc010014d6f6dae6ba2a1b6da60715a742b3cc2c59cb29be +EBUILD db-5.3.28-r8.ebuild 7191 BLAKE2B fa97fbb74f47de0e94e6616de6403bcf35a281ad9a88031130fa4e608f25d2c394774621cd4fa4c00b9b5a7d9e3d26610a3b3351acfb26bb4adb4fb8e416e029 SHA512 80b1a3781401f2b1d941ff8b80fb89cae6a1e0588a0615fb92e592b294178796f2e52330d03a38d439c88d36a81c8623032e77209261ec8b7c5f05fd4cd3e331 EBUILD db-6.0.35-r4.ebuild 7204 BLAKE2B 03972ccaf500cc7672bbc720959f9f96a7fb704925990b353920276537879f3273cdfcf0f4691ebeb721b4bfa6e6b7c38bb4c89c0ce722aa3a50f9cc300e97a0 SHA512 c6a39885e9149c8615599403129dc8b948ad4afd997f680f868919c6823fbd318174fffd83ad3cef692b3672b78e05ca59b481c67887345010aa1abe9525a52f EBUILD db-6.1.38-r1.ebuild 6994 BLAKE2B 56473fd89c18fbf475bb95802c19a9ecba67b9bc4749f986a684f39da755e3509d183252bca1c4afd73c84db35758b91cc33f9cbaaa6434ce938e48447836253 SHA512 3edfc11463f76723f179f5a683cab25ca67b3a4dbd38a1d0f0b149879b420fbf2c328f622269a63e113a7e542e3454f2ee3b350c8bfa75f65a635ae671508456 EBUILD db-6.2.38-r1.ebuild 7174 BLAKE2B d66ce4b678328c88a8c97f899780177e3ba3a369f42ab50bde09d1097434cd9210639356797559cd88069f70d69d40e98a82c964c84b8ad6966ae5b18fb9ba2f SHA512 59bd01603384927a3a45846b9064a3a63522113ff3d9f9384d4b6eb7c1edbe272495104b4c45582e2e35aef295ea80f81a25e3346bac4a8264eef7d0a3f034ad diff --git a/sys-libs/db/db-4.5.20_p2-r5.ebuild b/sys-libs/db/db-4.5.20_p2-r5.ebuild deleted file mode 100644 index c8677a2f0a4d..000000000000 --- a/sys-libs/db/db-4.5.20_p2-r5.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-4.4-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - local i j - for j in dist/aclocal{,_java} ; do - pushd ${j} &>/dev/null || die - for i in * ; do - ln -s ${i} ${i%.ac}.m4 || die - done - popd &>/dev/null || die - done - # END of 4.5+earlier specific - pushd dist &>/dev/null || die - rm aclocal/libtool.{m4,ac} || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64 ; then - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" - - sed -e "s,\(^STRIP *=\).*,\1\"true\"," -i Makefile || die -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - STRIP="true" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.5.20_p2-r6.ebuild b/sys-libs/db/db-4.5.20_p2-r6.ebuild index 04445720d1c0..72f1d68b26d8 100644 --- a/sys-libs/db/db-4.5.20_p2-r6.ebuild +++ b/sys-libs/db/db-4.5.20_p2-r6.ebuild @@ -27,7 +27,7 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" IUSE="tcl java doc cxx" RESTRICT="!test? ( test )" diff --git a/sys-libs/db/db-4.6.21_p4-r4.ebuild b/sys-libs/db/db-4.6.21_p4-r4.ebuild deleted file mode 100644 index d753b5db0f64..000000000000 --- a/sys-libs/db/db-4.6.21_p4-r4.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="tcl java doc cxx" -RESTRICT="!test? ( test )" - -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-4.4-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - pushd dist &>/dev/null || die - rm aclocal/libtool.m4 || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64 ; then - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - --host="${CHOST}" - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # the entire testsuite needs the TCL functionality - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - econf "${myconf[@]}" - - sed -e "s,\(^STRIP *=\).*,\1\"true\"," -i Makefile || die -} - -src_install() { - emake \ - DESTDIR="${D}" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - STRIP="true" \ - install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.6.21_p4-r5.ebuild b/sys-libs/db/db-4.6.21_p4-r5.ebuild index 6d51c0e1eb95..cf27b50dca2e 100644 --- a/sys-libs/db/db-4.6.21_p4-r5.ebuild +++ b/sys-libs/db/db-4.6.21_p4-r5.ebuild @@ -27,7 +27,7 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" IUSE="tcl java doc cxx" RESTRICT="!test? ( test )" diff --git a/sys-libs/db/db-4.7.25_p4-r4.ebuild b/sys-libs/db/db-4.7.25_p4-r4.ebuild deleted file mode 100644 index 7b7ac90fe7a2..000000000000 --- a/sys-libs/db/db-4.7.25_p4-r4.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86" -IUSE="doc java cxx tcl test" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) - test? ( >=dev-lang/tcl-8.4 ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( dev-lang/tcl ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/"${PN}"-4.4-libtool.patch - - # use the includes from the prefix - "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch -) - -# Required to avoid unpack attempt of patches -src_unpack() { - unpack "${MY_P}".tar.gz -} - -src_prepare() { - pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - pushd dist &>/dev/null || die - rm aclocal/libtool.m4 || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die - - popd &>/dev/null || die - popd &>/dev/null || die -} - -src_configure() { - # compilation with -O0 fails on amd64, see bug #171231 - if use amd64 ; then - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - --disable-rpc - - $(usex amd64 '--with-mutex=x86/gcc-assembly' '') - $(use_enable cxx) - $(use_enable tcl) - $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" - $(use_enable java) - $(use_enable test) - ) - - if use java; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl && use test ; then - myconf+=( --enable-test ) - else - myconf+=( --disable-test ) - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - ECONF_SOURCE="${S}"/../dist \ - STRIP="true" \ - econf "${myconf[@]}" - - # The embedded assembly on ARM does not work on newer hardware - # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. - # Specifically, it uses the SWPB op, which was deprecated: - # http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm - - # The op ALSO cannot be used in ARM-Thumb mode. - # Trust the compiler instead. - # >=db-6.1 uses LDREX instead. -} - -src_install() { - emake DESTDIR="${D}" install - - db_src_install_usrbinslot - - db_src_install_headerslot - - db_src_install_doc - - db_src_install_usrlibcleanup - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.7.25_p4-r5.ebuild b/sys-libs/db/db-4.7.25_p4-r5.ebuild index d7c527220db6..81a4d83f617d 100644 --- a/sys-libs/db/db-4.7.25_p4-r5.ebuild +++ b/sys-libs/db/db-4.7.25_p4-r5.ebuild @@ -29,7 +29,7 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86" IUSE="doc java cxx tcl test" # the entire testsuite needs the TCL functionality diff --git a/sys-libs/db/db-4.8.30-r5.ebuild b/sys-libs/db/db-4.8.30-r5.ebuild deleted file mode 100644 index 598b13dac88f..000000000000 --- a/sys-libs/db/db-4.8.30-r5.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="doc java cxx tcl test" - -REQUIRED_USE="test? ( tcl )" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.8-libtool.patch - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch -) - -src_prepare() { - cd "${WORKDIR}"/"${MY_P}" || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \ - || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - cd dist || die - rm aclocal/libtool.m4 || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ - -i configure || die -} - -multilib_src_configure() { - local myconf=( - --enable-compat185 - --enable-o_direct - --without-uniquename - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) - $(use_enable cxx) - $(use_enable cxx stl) - $(multilib_native_use_enable java) - $(use_enable test) - ) - - tc-ld-force-bfd #470634 #729510 - - # compilation with -O0 fails on amd64, see bug #171231 - if [[ ${ABI} == amd64 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl || use test ; then - myconf+=( - --enable-tcl - --with-tcl="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=(--disable-tcl ) - fi - - ECONF_SOURCE="${S}"/../dist \ - STRIP="true" \ - econf "${myconf[@]}" - - # The embedded assembly on ARM does not work on newer hardware - # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. - # Specifically, it uses the SWPB op, which was deprecated: - # http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm - # The op ALSO cannot be used in ARM-Thumb mode. - # Trust the compiler instead. - # >=db-6.1 uses LDREX instead. -} - -multilib_src_test() { - multilib_is_native_abi || return - - S="${BUILD_DIR}" db_src_test -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - db_src_install_headerslot - - db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -multilib_src_install_all() { - db_src_install_usrbinslot - - db_src_install_doc - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi -} - -pkg_postinst() { - multilib_foreach_abi db_fix_so -} - -pkg_postrm() { - multilib_foreach_abi db_fix_so -} diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild index 0b56bb919ef3..e26ebc8ebfa8 100644 --- a/sys-libs/db/db-4.8.30-r6.ebuild +++ b/sys-libs/db/db-4.8.30-r6.ebuild @@ -29,7 +29,7 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" IUSE="doc java cxx tcl test" REQUIRED_USE="test? ( tcl )" diff --git a/sys-libs/db/db-5.3.28-r6.ebuild b/sys-libs/db/db-5.3.28-r6.ebuild deleted file mode 100644 index a89dd6db5986..000000000000 --- a/sys-libs/db/db-5.3.28-r6.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit epatch db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO=${PV/*.*.*_p} -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV=${PV} - MY_P=${P} - PATCHNO=0 -else - MY_PV=${PV/_p${PATCHNO}} - MY_P=${PN}-${MY_PV} -fi - -RESTRICT="!test? ( test )" - -S_BASE="${WORKDIR}/${MY_P}" -S="${S_BASE}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="5.3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc java cxx tcl test" - -REQUIRED_USE="test? ( tcl )" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.7 ) - >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.7 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/db5.3/db.h -) - -src_prepare() { - cd "${WORKDIR}"/"${MY_P}" - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - # bug #510506 - epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - epatch "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - - # sqlite configure call has an extra leading .. - # upstreamed:5.2.36, missing in 5.3.x - epatch "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch - - # The upstream testsuite copies .lib and the binaries for each parallel test - # core, ~300MB each. This patch uses links instead, saves a lot of space. - epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch - - # Needed when compiling with clang - epatch "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch - - # Upstream release script grabs the dates when the script was run, so lets - # end-run them to keep the date the same. - export REAL_DB_RELEASE_DATE="$(awk \ - '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ - "${S_BASE}"/dist/configure)" - sed -r -i \ - -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ - "${S_BASE}"/dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - - cd "${S_BASE}"/dist || die - rm -f aclocal/libtool.m4 - sed -i \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac || die - sed -i \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - for v in \ - DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ - DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ - DB_VERSION \ - DB_RELEASE_DATE ; do - local ev="__EDIT_${v}__" - sed -i -e "s/${ev}/${!v}/g" configure || die - done - - # This is a false positive skip in the tests as the test-reviewer code - # looks for 'Skipping\s' - sed -i \ - -e '/db_repsite/s,Skipping:,Skipping,g' \ - "${S_BASE}"/test/tcl/reputils.tcl || die -} - -multilib_src_configure() { - local myconf=() - - tc-ld-force-bfd #470634 #729510 - - # compilation with -O0 fails on amd64, see bug #171231 - if [[ ${ABI} == amd64 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl || use test ; then - myconf+=( - --enable-tcl - --with-tcl="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=(--disable-tcl ) - fi - - # sql_compat will cause a collision with sqlite3 - # --enable-sql_compat - ECONF_SOURCE="${S_BASE}"/dist \ - STRIP="true" \ - econf \ - --enable-compat185 \ - --enable-dbm \ - --enable-o_direct \ - --without-uniquename \ - --enable-sql \ - --enable-sql_codegen \ - --disable-sql_compat \ - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \ - $(use_enable cxx) \ - $(use_enable cxx stl) \ - $(multilib_native_use_enable java) \ - "${myconf[@]}" \ - $(use_enable test) - # The embedded assembly on ARM does not work on newer hardware - # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. - # Specifically, it uses the SWPB op, which was deprecated: - # http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm - # The op ALSO cannot be used in ARM-Thumb mode. - # Trust the compiler instead. - # >=db-6.1 uses LDREX instead. -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - db_src_install_headerslot - - db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -multilib_src_install_all() { - db_src_install_usrbinslot - - db_src_install_doc - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi -} - -pkg_postinst() { - multilib_foreach_abi db_fix_so -} - -pkg_postrm() { - multilib_foreach_abi db_fix_so -} - -src_test() { - # db_repsite is impossible to build, as upstream strips those sources. - # db_repsite is used directly in the setup_site_prog, - # setup_site_prog is called from open_site_prog - # which is called only from tests in the multi_repmgr group. - #sed -ri \ - # -e '/set subs/s,multi_repmgr,,g' \ - # "${S_BASE}/test/testparams.tcl" - sed -ri \ - -e '/multi_repmgr/d' \ - "${S_BASE}/test/tcl/test.tcl" || die - - # This is the only failure in 5.2.28 so far, and looks like a false positive. - # Repmgr018 (btree): Test of repmgr stats. - # Repmgr018.a: Start a master. - # Repmgr018.b: Start a client. - # Repmgr018.c: Run some transactions at master. - # Rep_test: btree 20 key/data pairs starting at 0 - # Rep_test.a: put/get loop - # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 - sed -ri \ - -e '/set parms.*repmgr018/d' \ - -e 's/repmgr018//g' \ - "${S_BASE}/test/tcl/test.tcl" || die - - multilib-minimal_src_test -} - -multilib_src_test() { - multilib_is_native_abi || return - - S=${BUILD_DIR} db_src_test -} diff --git a/sys-libs/db/db-5.3.28-r7.ebuild b/sys-libs/db/db-5.3.28-r7.ebuild deleted file mode 100644 index 9e789e440c02..000000000000 --- a/sys-libs/db/db-5.3.28-r7.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs - -#Number of official patches -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` -PATCHNO="${PV/*.*.*_p}" -if [[ ${PATCHNO} == "${PV}" ]] ; then - MY_PV="${PV}" - MY_P="${P}" - PATCHNO=0 -else - MY_PV="${PV/_p${PATCHNO}}" - MY_P="${PN}-${MY_PV}" -fi - -RESTRICT="!test? ( test )" - -S_BASE="${WORKDIR}/${MY_P}" -S="${S_BASE}/build_unix" -DESCRIPTION="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86" -IUSE="doc java cxx tcl test" - -REQUIRED_USE="test? ( tcl )" - -# the entire testsuite needs the TCL functionality -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.7 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.7 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/db${SLOT}/db.h -) - -PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - - # sqlite configure call has an extra leading .. - # upstreamed:5.2.36, missing in 5.3.x - "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch - - # The upstream testsuite copies .lib and the binaries for each parallel test - # core, ~300MB each. This patch uses links instead, saves a lot of space. - "${FILESDIR}"/${PN}-6.0.20-test-link.patch - - # Needed when compiling with clang - "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch -) - -src_prepare() { - cd "${S_BASE}" || die - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - default - - # Upstream release script grabs the dates when the script was run, so lets - # end-run them to keep the date the same. - export REAL_DB_RELEASE_DATE="$(awk \ - '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ - "${S_BASE}"/dist/configure)" - sed -r \ - -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ - -i dist/RELEASE || die - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - - cd dist || die - rm aclocal/libtool.m4 || die - sed \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - -i configure.ac || die - sed \ - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ - -i aclocal/programs.m4 || die - - AT_M4DIR="aclocal aclocal_java" eautoreconf - - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - local v ev - for v in \ - DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ - DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ - DB_VERSION \ - DB_RELEASE_DATE ; do - ev="__EDIT_${v}__" - sed -e "s/${ev}/${!v}/g" -i configure || die - done - - # This is a false positive skip in the tests as the test-reviewer code - # looks for 'Skipping\s' - sed \ - -e '/db_repsite/s,Skipping:,Skipping,g' \ - -i "${S_BASE}"/test/tcl/reputils.tcl || die -} - -multilib_src_configure() { - local myconf=( - # sql_compat will cause a collision with sqlite3 - #--enable-sql_compat - # Don't --enable-sql* because we don't want to use bundled sqlite. - # See Gentoo bug #605688 - --enable-compat185 - --enable-dbm - --enable-o_direct - --without-uniquename - --disable-sql - --disable-sql_codegen - --disable-sql_compat - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) - $(use_enable cxx) - $(use_enable cxx stl) - $(multilib_native_use_enable java) - $(use_enable test) - ) - - tc-ld-force-bfd #470634 #729510 - - # compilation with -O0 fails on amd64, see bug #171231 - if [[ ${ABI} == amd64 ]]; then - local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" - replace-flags -O0 -O2 - is-flagq -O[s123] || append-flags -O2 - fi - - # Add linker versions to the symbols. Easier to do, and safer than header file - # mumbo jumbo. - if use userland_GNU ; then - append-ldflags -Wl,--default-symver - fi - - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - - # Bug #270851: test needs TCL support - if use tcl || use test ; then - myconf+=( - --enable-tcl - --with-tcl="${EPREFIX}/usr/$(get_libdir)" - ) - else - myconf+=(--disable-tcl ) - fi - - ECONF_SOURCE="${S_BASE}"/dist \ - STRIP="true" \ - econf "${myconf[@]}" - - # The embedded assembly on ARM does not work on newer hardware - # so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. - # Specifically, it uses the SWPB op, which was deprecated: - # http://www.keil.com/support/man/docs/armasm/armasm_dom1361289909499.htm - # The op ALSO cannot be used in ARM-Thumb mode. - # Trust the compiler instead. - # >=db-6.1 uses LDREX instead. -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - db_src_install_headerslot - - db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -multilib_src_install_all() { - db_src_install_usrbinslot - - db_src_install_doc - - dodir /usr/sbin - # This file is not always built, and no longer exists as of db-4.8 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then - mv "${ED}"/usr/bin/berkeley_db_svc \ - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die - fi -} - -pkg_postinst() { - multilib_foreach_abi db_fix_so -} - -pkg_postrm() { - multilib_foreach_abi db_fix_so -} - -src_test() { - # db_repsite is impossible to build, as upstream strips those sources. - # db_repsite is used directly in the setup_site_prog, - # setup_site_prog is called from open_site_prog - # which is called only from tests in the multi_repmgr group. - #sed -ri \ - # -e '/set subs/s,multi_repmgr,,g' \ - # "${S_BASE}/test/testparams.tcl" - sed -r \ - -e '/multi_repmgr/d' \ - -i "${S_BASE}/test/tcl/test.tcl" || die - - # This is the only failure in 5.2.28 so far, and looks like a false positive. - # Repmgr018 (btree): Test of repmgr stats. - # Repmgr018.a: Start a master. - # Repmgr018.b: Start a client. - # Repmgr018.c: Run some transactions at master. - # Rep_test: btree 20 key/data pairs starting at 0 - # Rep_test.a: put/get loop - # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 - sed -r \ - -e '/set parms.*repmgr018/d' \ - -e 's/repmgr018//g' \ - -i "${S_BASE}/test/tcl/test.tcl" || die - - multilib-minimal_src_test -} - -multilib_src_test() { - multilib_is_native_abi || return - - S="${BUILD_DIR}" db_src_test -} diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild index 7da5133f3c77..982f14a543a5 100644 --- a/sys-libs/db/db-5.3.28-r8.ebuild +++ b/sys-libs/db/db-5.3.28-r8.ebuild @@ -29,7 +29,7 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc java cxx tcl test" REQUIRED_USE="test? ( tcl )" diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest index 837be83f0516..0fcfe158c7e0 100644 --- a/sys-libs/gdbm/Manifest +++ b/sys-libs/gdbm/Manifest @@ -3,5 +3,5 @@ AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e3187 DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495 EBUILD gdbm-1.18.1-r1.ebuild 1357 BLAKE2B aa2a7ab93463f3400b8760ebde02bd1a93164c96c3d7b68807fad6d68002373470583f9e9f9dab78b7171b7579940a171ba688330d3f679431b37b5054ac6e2e SHA512 3e86f0cf3eff1e4c5a8aad315992efd2cb452ef117b1b961612db186144ef42c2158adea2d998e2c2ac58472c379a3553abac0613419884c57922a8fb433eed4 -EBUILD gdbm-1.19.ebuild 1324 BLAKE2B 77e8e86bf88a87d704be53ce285af647b99d890270e5c52a30aa068f32ac35b65e77ffad715568b8285415d3eb78d2b22f8bbdb78310d080dc77c5293e73a4dc SHA512 2a8b8ea03dfa2ea968ae315076906db407c0b7edd955f8909bf07771a2238d9abc175db380c585cc171c9f034bdc65827de0e774affb4ed4f25e6e32b48114a9 +EBUILD gdbm-1.19.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169 diff --git a/sys-libs/gdbm/gdbm-1.19.ebuild b/sys-libs/gdbm/gdbm-1.19.ebuild index 36ea91f14e6d..a6fc57b2a1d8 100644 --- a/sys-libs/gdbm/gdbm-1.19.ebuild +++ b/sys-libs/gdbm/gdbm-1.19.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+berkdb nls +readline static-libs" DEPEND=" diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index da6b81bb001f..bfcd6b2ec19d 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -1,13 +1,7 @@ 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.1.4.tar.gz 1673335 BLAKE2B 581ea127715d82d849f78c11fc66eb278e45f6c9ff9b379d5a3cfaa8c9c424004614a5a9c2120710d23feb1252294e2abd4983158a2a46e5d70180ad3c765dbd SHA512 7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e -DIST ldb-2.1.5.tar.gz 1675898 BLAKE2B 0097a7437a96e4daa04fc77f574e6b27150e83be10db903a1f48d41ffde9c83b0712a5487e0f61644aedabb3d9ee7b4290ea0d56a402cdfa6692597154543e24 SHA512 4f75c7b952713f8f78d06fd9b3e4920bfa3c4f95630f608517b7528e77dcc13ddabcfcf3ca4221be8418209a83b094583f5c374ff74f36a48676a3d4bef67817 -DIST ldb-2.2.0.tar.gz 1676551 BLAKE2B 1ad84372b024e1ed680a09d215324027c9a37883204c2e69bb39d28a280cba639a4a46ec12b12d89f291f5505f55849eee880345412c6d95d9b6d6e9c00a4fd9 SHA512 3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69 DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348 -EBUILD ldb-2.1.4-r1.ebuild 2810 BLAKE2B 651d9396e96ecc9cd9aed25498dc39fb2a1ef14b3c570a6af6508ae64c89cfbe29e36d77dc9b00e57b78285d096d9b7e9f7e438bbc437f7dab7bc33dd94d07eb SHA512 068466a5d6523c6ebb8990786ac74b65e954d1bd5803cb73112d6e892a823984dc3c1507ad9b4f595d3ee6e2461b06fb1393dae344a58a2e14bb2b51cd0a7d31 -EBUILD ldb-2.1.5.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 -EBUILD ldb-2.2.0-r2.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 EBUILD ldb-2.2.1.ebuild 2933 BLAKE2B 2da626474cc1e846f539bacdaa6b03b71881ce4c1a812845aad18e2374b3606ee31b03bd73826709506ac4db412203d5d8b3d46858b4ef8a597d29e09d2901fa SHA512 926b82a29f8ab2d77186f871357c162e07ef659725fb0ac166d1a5dc648e40ed2dadb1de479eebf37911237ea001386808493669cdf160ca2c29609c9d0f6c01 EBUILD ldb-2.3.0.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95 diff --git a/sys-libs/ldb/ldb-2.1.4-r1.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild deleted file mode 100644 index 41520fcbd401..000000000000 --- a/sys-libs/ldb/ldb-2.1.4-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{7,8} ) -PYTHON_REQ_USE="threads(+)" - -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="An LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://www.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" - -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[python?,${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.3[python?,${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.10.2[python(+)?,${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) -" - -DEPEND="dev-libs/libxslt - doc? ( app-doc/doxygen ) - virtual/pkgconfig - ${PYTHON_DEPS} - ${RDEPEND} -" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - test? ( python )" - -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.1.5.ebuild b/sys-libs/ldb/ldb-2.1.5.ebuild deleted file mode 100644 index c36e5d65316e..000000000000 --- a/sys-libs/ldb/ldb-2.1.5.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.2.0-r2.ebuild b/sys-libs/ldb/ldb-2.2.0-r2.ebuild deleted file mode 100644 index c36e5d65316e..000000000000 --- a/sys-libs/ldb/ldb-2.2.0-r2.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/libapparmor/Manifest b/sys-libs/libapparmor/Manifest index 91bed538ad23..c01321bc70cd 100644 --- a/sys-libs/libapparmor/Manifest +++ b/sys-libs/libapparmor/Manifest @@ -5,5 +5,5 @@ DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 EBUILD libapparmor-2.13.4.ebuild 2129 BLAKE2B c1cb757b4df3b1c0d285d6f22d43c921aff5ae091f27de6c1bd87273ab4bbddc8a0bcf073ed9183bf0f922ab9742b5a1533d71aad4eb4cfe4984ef0a3272e3ba SHA512 efb43e0bec424fe05204721f9361c5b1f51645f22ec617cc5e1e60e62b165ba61cb748c318f371fd86695e2198b496efdaa2e8ccf90f76f4a0c2786ae188ccd7 EBUILD libapparmor-3.0.0.ebuild 2164 BLAKE2B 96091697a0d90ef481687b928e062946cef57e7f681146dd7587d909cedd969f4be2afd7391032ddfca4ea96dfd7c1f2d3f7873578e6cb8ca74c8488f1e7f1f8 SHA512 43ac5f822a3f764fb51296bc33b6da85530d64dd5c3171b8f0885ac01950d5ba918ab35e5ebac40e38f3ab375ffd8359fc09cefc568327ca58484fd3040a86a3 -EBUILD libapparmor-3.0.1.ebuild 2098 BLAKE2B e6988e862e07aacaf7ae9c9205c1e82b5e95bec205c88401d7e7d304881814c18148dacfbf2575469255135bf8a09c6585b6c1147c93b6f6bff8588adae8ca95 SHA512 f7b9f67a8297dade9946308ac6983b1e2365d555e3297f0acddaa56b2a1f916d08faebb1ffd743c83bc0f16ec6db2b09b565a2c65a46e93978c15c280b320355 +EBUILD libapparmor-3.0.1.ebuild 2099 BLAKE2B 78917701ade725899091e4e76d5bec62dc9cc61d0f678d182764434ea91e515a98f8413413e184747c5e9863fe829860e1e9d1b23fd4c5ac5a06eb007b946659 SHA512 c56a65ab1ca44c0bbbe46eeb6e82ae0eea681c8f12f96dc9569c4a5d842b6a3537517ea3578e04e0a6b07fa39c81d0882a199642159819d1a3f8e82d4ea32cec MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8 diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild index 65eb3d388ace..c1c67c1df117 100644 --- a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild +++ b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_SETUPTOOLS="no" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) GENTOO_DEPEND_ON_PERL="no" inherit autotools distutils-r1 perl-functions @@ -18,7 +18,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}. LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="doc +perl +python static-libs" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest index edad306c3078..4fdf881a7d55 100644 --- a/sys-libs/libblockdev/Manifest +++ b/sys-libs/libblockdev/Manifest @@ -1,6 +1,6 @@ DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6 DIST libblockdev-2.25.tar.gz 930238 BLAKE2B ae28c40b5e114826baf4a8ba9012267b297dbc4abee52669cf39c886d2c9989291f41937ec742c7457049a6a30e674f9c89ad6478923f393ae1773db3afcf621 SHA512 628d05f3a257b44208a9d0b5d84ae248fefd415812d9a93d132c03039b09fefc4d6110beb9aa0d3072e3f0c992e642d7867d0241209056538f132f86a748e195 EBUILD libblockdev-2.24.ebuild 2607 BLAKE2B 8070fda4de97cbb3744f72abe7a26e5a158382569d2af63e094b4983485a29096f672ab9ed97e323e5b2a810697669fc8214e47ed0a685a0de43d16201437c11 SHA512 13fb01f0d87e6f9f92d8c94b59404e08976e98f7d7729801b6d5be1f929aaba2f43ce0b15249ef669fb486e2e463e9946cfa1cb72f08e0b34ea6ef0fa9d9e75a -EBUILD libblockdev-2.25.ebuild 2613 BLAKE2B ec6cdce6da9278b4ea09c0a004ce5cdd15849759bc67850535c62aa0bbece7c6c7f7591cb61d33460106aed1f701075b1c121fbe381fb4f87dac208f687c68be SHA512 1002a8d5df27e75c546ab71ed6c6db744b566d1e86f8bb1b4b0810c93e466b8c079eb89cae5e083fff5814cc8e3eee39e12a267d83b52d239529d250f513bbcf +EBUILD libblockdev-2.25.ebuild 2620 BLAKE2B abdec73cdc1336f734acd7658dc0869f3b05c0653c0cb52b976393f5e4056196cc5e98f5b1072812ae0c593d93eddcf905cb814bb592d3c2b025a738dd08174e SHA512 90894691d584bea79837c9b6c216c7104ffbe59c928ba7c3d7f491cae90650870e12489771c2c62403481580f01d3f331760a61b442a0ffcd40c2666555739e2 EBUILD libblockdev-9999.ebuild 2613 BLAKE2B ec6cdce6da9278b4ea09c0a004ce5cdd15849759bc67850535c62aa0bbece7c6c7f7591cb61d33460106aed1f701075b1c121fbe381fb4f87dac208f687c68be SHA512 1002a8d5df27e75c546ab71ed6c6db744b566d1e86f8bb1b4b0810c93e466b8c079eb89cae5e083fff5814cc8e3eee39e12a267d83b52d239529d250f513bbcf MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9 diff --git a/sys-libs/libblockdev/libblockdev-2.25.ebuild b/sys-libs/libblockdev/libblockdev-2.25.ebuild index 8cd5e5f095e8..7a897bf92547 100644 --- a/sys-libs/libblockdev/libblockdev-2.25.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.25.ebuild @@ -19,7 +19,7 @@ else #MY_P="${PN}-${MY_PV}" #SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" #S="${WORKDIR}/${MY_P}" fi LICENSE="LGPL-2+" diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest index 09fab89d4135..a9da9438e3a4 100644 --- a/sys-libs/libcap-ng/Manifest +++ b/sys-libs/libcap-ng/Manifest @@ -6,6 +6,6 @@ DIST libcap-ng-0.8.2.tar.gz 456066 BLAKE2B 7e721d05b92fd3708b970527e76b1898daa91 DIST libcap-ng-0.8.tar.gz 453181 BLAKE2B 8f4b2e13e5c2c21f1ac1455ebdaf04b42e07fa79d9026651f41eab041cdf99bd40d91b8ce2262e58bc2de3e2a793f676df8c69d832ccadfa4b486ebefeb4b128 SHA512 d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2 EBUILD libcap-ng-0.7.11.ebuild 2049 BLAKE2B 35338ba2407a07b2477a12064c41573de88eb24bc8b237b329c007f7d3958c2d0b1af1eba4ff5f928aea566a33ac966acc6df08052df69de0df21319891b7d18 SHA512 e8a66b995343cabcf000bfbcae83a66e638c12be38b628a669429c603909e6868497309c2e66538dc34c6a84b8a874ab9b11a2783505baa45072d55c5b49b633 EBUILD libcap-ng-0.8.1-r1.ebuild 2648 BLAKE2B 7575eefdfdd2a62e973cd1485523fa2247665babcb858c78ba30036ff46b97dcea644e9be672d64a509e112dd07b61586ea92ba0f7c3100b5aad2778fe079931 SHA512 3778f3ebff0e4e9e2f1ed91159700a7db9e3529ab31de4c9bc0d597d92706be57a03451cb4ad82dd5b8da22e376758dc733bbecbfdb02f1c4d189a4d364f8e2b -EBUILD libcap-ng-0.8.2-r1.ebuild 2368 BLAKE2B 2a585c5e72dc4e3355662e59ea6a714bcabc9dbb3c87525653066807a7900e34b52668f06927a89f934f0d680819f0068cb4eb95cd126f818d1b6ba049807ac8 SHA512 c2fc07fd2795837f05b0a849a912199e1c02f9331e505c2bb292d2f352f546a0ba8c29ac2256985ef018dbe4aa190136cd39927b48bb6d21d239673a6b7038b0 +EBUILD libcap-ng-0.8.2-r1.ebuild 2360 BLAKE2B 80205b9fe7bace9bf26e569c1c07d91eae2e07afb619697d2f62d84a0ae2b520d688225fcf897e8e33aee9b989e01fd39b55a9bde2e13ff806d379138ea683bd SHA512 b941ffc08d3c9bd1018ece53bd42e548697c48999250a5e76d71b6b51bbddd63e750061aeed65b6175265e04353dd9e4f04be23038771184a239f9ad714b5217 EBUILD libcap-ng-0.8.ebuild 2057 BLAKE2B 6d9b1f73c76c72c698f497ac602d149ca8ad673142ab698a84382e8e273e1ba6805fd856947102db03fbc038675f6faf291a38d123a085d4ba8b182132b862a4 SHA512 6aef3e5a87aa6e6bec3dabd1c4259a8b0bb13fd31defecd4ff36957171ef292ba63314542c861d5768802721badb90bca4cd2a87edc021a68f3fca1889522de9 MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95 diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild index 52a72cf9c088..e8d8ab36eeac 100644 --- a/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild +++ b/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" IUSE="python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index dbc928b3c6d5..66a9bd53db68 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -3,10 +3,14 @@ AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80 +AUX libcap-2.50-build-system-fixes.patch 6687 BLAKE2B d46b6f0734a5acd930248b29c17850447d87f4e554b4d3e79cb35d978b17552e84e27e036c3b0c4ae6573f94e9e7033a9264b646d61dc8c441c04bc6d9b12af8 SHA512 0fd3b5463dcbbaca41d7c1099be7dd370945408f3763dad68d128a650cbf62c23c653a971b07ed4cdc1b56d425caeec3775b91912635c6a2539534bd20e00756 +AUX libcap-2.50-install_capsh_again.patch 991 BLAKE2B f9260fe8d3045e7d4408d5c2ba976a7c22031f174a14c282c31df8e4ac9a7a9cfe8207bdacd0b10d4ed741030319f2524edfc6ca28abdc0040118f2e3286b350 SHA512 891f690440b6d67a2d1f32bb1a8fc51048ba2b6d8c5e0cc1543d741e1ed0b32898a7df7641382698b23056b279c7cf7ed1cfa162a1908ff6362cf011e22d632b DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45 DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0 +DIST libcap-2.50.tar.xz 143792 BLAKE2B be83dfe1e55a4363936f53afb13edd2c1fd8c9bc27f7946bfda1eb8fb3046d0370997dcf85ba9dab7de10673527b4e8d15f104a75eaf407cba8ed0fc42465790 SHA512 6ac2df1ea9a9154e082c0595d343380ff8abed953b53c635a9297683289f2fa708eff488a42c6053e5ac556a5d90faa8709b3d98a47b2911f05bf80f2663a543 EBUILD libcap-2.43.ebuild 2164 BLAKE2B dce446ad76deb296dd6c526ada8b15e6d0965dae57acd3599a84fc28295ab1d30ebe9f3de7b346d8247ee782235037a30c60599c06a0db444aa6d4ab0434a0d6 SHA512 112e5c6fae86a2e3a01681853515eca16fd65e42d6c9857f451b5e6188259daf6d7e80a23371d3a97b4af3688a3e13cf339daa938381eae6206d7b4a63d720e3 EBUILD libcap-2.48.ebuild 2202 BLAKE2B dec34ea59189902fec1554dd51f425a86c1cc74484b8ac8c5c8c3fbacd878a5c671db1c7028349cfadaf2e69ddd3947e854f0fc58bcc1936566b9d0ab63a3927 SHA512 1389c09e6dfda0a790b0974240de29ea958acc2cbb38b23e10408007a1feb19d58999f8c964a54f470f4dc630215cdf16ac8b9b48611e8da81862239ad3d5c2c -EBUILD libcap-2.49.ebuild 2203 BLAKE2B 24f7c27fab4505bf3ddd8b682011f6b39433c8aa8692080c8649ecb5c660b1a9f2f0ad8d540992886d08a126c49c79ddcb7c06f40d7479b18602dc07170250f5 SHA512 5254d1d7982272cb0da280ff71d7da54d4701da35e59257f0cc82a7034e1655a0bf1115b2e3de3b08c3ea5d418fabc2351a786f9d818ae9e44c45eb022ea8426 +EBUILD libcap-2.49.ebuild 2195 BLAKE2B b5950f22f86e8ee2008751b9ab76013d603c201e5b1c1665c34f4d7e31bb2102ad1e3ad1c0ad67b2ca48ae5f76ba4c12169f61493a3861e97f1744a3d5355133 SHA512 2a84719633d35cd16a301cbdcde67dc1ee4e7f1f04c043303404d1b088529491fdfdfadd29c3eb5f8a2afbfe7dede105885063322645bca986ffcdf002bb42ee +EBUILD libcap-2.50-r1.ebuild 2263 BLAKE2B c05c69b56c92c537dbfa49a48ce1090552c274e638638c6e934ed8b97fb872169d077b07a73e7439210ce9d7a0a3cd935692ae766669603d9482a64f0e3d7eaa SHA512 5f667e05321f15f55ced0dc98520429085808cbbc751f9c7aeab2e75067512fc03fe04bb0f41d27390ea634cc0a2f8a30856142bbd8cbc633042e41163082f07 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1 diff --git a/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch new file mode 100644 index 000000000000..45b24421c8a9 --- /dev/null +++ b/sys-libs/libcap/files/libcap-2.50-build-system-fixes.patch @@ -0,0 +1,209 @@ +From 1f2465ec2b9dccd9823a54938722dc4e5edb8105 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Wed, 4 Nov 2020 22:46:20 +0100 +Subject: [PATCH] build system fixes + +This touches up the homebrewed build system to work much better "out of the +box" for people. Specifically: + - allow toolchain vars to be set via environment + - CC / BUILD_CC / AR / RANLIB + - CFLAGS / CPPFLAGS / LDFLAGS + - split CPPFLAGS out of CFLAGS + - break -fPIC out of global CFLAGS and only use where needed + - use LDLIBS for libraries, not LDFLAGS + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +Forward ported from libcap-2.24 to libcap-2.25 +Forward ported from libcap-2.25 to libcap-2.28 +Forward ported from libcap-2.28 to libcap-2.29 +Forward ported from libcap-2.29 to libcap-2.33 +Forward ported from libcap-2.33 to libcap-2.34 +Forward ported from libcap-2.34 to libcap-2.37 +Forward ported from libcap-2.37 to libcap-2.39 +Forward ported from libcap-2.39 to libcap-2.42 +Forward ported from libcap-2.42 to libcap-2.44 +Forward ported from libcap-2.44 to libcap-2.45 +Forward ported from libcap-2.45 to libcap-2.48 +Forward ported from libcap-2.48 to libcap-2.50 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + Make.Rules | 10 ++++++---- + Makefile | 1 - + libcap/Makefile | 7 ++++--- + pam_cap/Makefile | 8 +++++--- + progs/Makefile | 4 ++-- + tests/Makefile | 6 ++++-- + 6 files changed, 21 insertions(+), 15 deletions(-) + +diff --git a/Make.Rules b/Make.Rules +index 98284e2..a797347 100644 +--- a/Make.Rules ++++ b/Make.Rules +@@ -52,7 +52,6 @@ GOMAJOR=1 + # Compilation specifics + + KERNEL_HEADERS := $(topdir)/libcap/include/uapi +-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include + + CC := $(CROSS_COMPILE)gcc + DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +@@ -60,7 +59,7 @@ COPTS ?= -O2 + CFLAGS ?= $(COPTS) $(DEFINES) + BUILD_CC ?= $(CC) + BUILD_COPTS ?= -O2 +-BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) ++BUILD_CFLAGS ?= $(CFLAGS) + AR := $(CROSS_COMPILE)ar + RANLIB := $(CROSS_COMPILE)ranlib + DEBUG = -g #-DDEBUG +@@ -76,10 +75,13 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS) + + BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) + +-SYSTEM_HEADERS = /usr/include ++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES) ++CPPFLAGS += $(LIBCAP_CPPFLAGS) ++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) + INCS=$(topdir)/libcap/include/sys/capability.h + LDFLAGS += -L$(topdir)/libcap +-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) ++CPPFLAGS += -Dlinux ++CFLAGS += $(WARNINGS) $(DEBUG) + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + + # SHARED tracks whether or not the SHARED libraries (libcap.so, +diff --git a/Makefile b/Makefile +index bfc2089..2b06c9a 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) + $(MAKE) -C go $@ + rm -f cap/go.sum + endif +- $(MAKE) -C tests $@ + $(MAKE) -C progs $@ + $(MAKE) -C doc $@ + $(MAKE) -C kdebug $@ +diff --git a/libcap/Makefile b/libcap/Makefile +index 9563d88..4b42f01 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -25,6 +25,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) + PSXOBJS=$(addsuffix .o, $(PSXFILES)) + MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) + MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) ++CFLAGS += -fPIC + + all: pcs $(STACAPLIBNAME) + ifeq ($(SHARED),yes) +@@ -66,7 +67,7 @@ libpsx.pc: libpsx.pc.in + $< >$@ + + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h +@@ -105,10 +106,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc + endif + + %.o: %.c $(INCLS) +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) +- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ + + cap_test: cap_test.c libcap.h + $(CC) $(CFLAGS) $(IPATH) $< -o $@ +diff --git a/pam_cap/Makefile b/pam_cap/Makefile +index 56604fd..2da4674 100644 +--- a/pam_cap/Makefile ++++ b/pam_cap/Makefile +@@ -3,6 +3,8 @@ + topdir=$(shell pwd)/.. + include ../Make.Rules + ++CFLAGS += -fPIC ++ + all: pam_cap.so + $(MAKE) testlink + +@@ -16,16 +18,16 @@ install: all + # written (and you know why it fails), email me and explain why. Thanks! + + pam_cap.so: pam_cap.o +- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) ++ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) + + pam_cap.o: pam_cap.c +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + test_pam_cap: test_pam_cap.c pam_cap.c + $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static + + testlink: test.c pam_cap.o +- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) + + test: pam_cap.so + make testlink +diff --git a/progs/Makefile b/progs/Makefile +index 289186e..313dc4d 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) + $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) + + %.o: %.c $(INCS) +- $(CC) $(IPATH) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) +@@ -46,7 +46,7 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh + diff -u capshdoc.h $@ || (rm $@ ; exit 1) + + capsh: capsh.c capshdoc.h.cf $(DEPS) +- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) ++ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) + + tcapsh-static: capsh.c capshdoc.h.cf $(DEPS) + $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static +diff --git a/tests/Makefile b/tests/Makefile +index 3a917c4..07eb2d5 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) + $(MAKE) psx_test libcap_psx_test libcap_psx_launch_test + endif + ++CFLAGS += -fPIC ++ + install: all + + ifeq ($(DYNAMIC),yes) +@@ -63,13 +65,13 @@ run_psx_test: psx_test + ./psx_test + + psx_test: psx_test.c $(DEPS) +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) + + run_libcap_psx_test: libcap_psx_test + ./libcap_psx_test + + libcap_psx_test: libcap_psx_test.c $(DEPS) +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) + + # privileged + uns_test: uns_test.c $(DEPS) +-- +2.32.0.rc1 + diff --git a/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch b/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch new file mode 100644 index 000000000000..0ae7520dc7b9 --- /dev/null +++ b/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch @@ -0,0 +1,38 @@ +From 1f8d32942be54850a3a89c7b58ba5613b5525c58 Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" <morgan@kernel.org> +Date: Fri, 28 May 2021 13:41:17 -0700 +Subject: [PATCH] Make capsh an installed binary again + +Bug report from Jan Palus: + + https://bugzilla.kernel.org/show_bug.cgi?id=213261 + +Signed-off-by: Andrew G. Morgan <morgan@kernel.org> +--- + progs/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/progs/Makefile b/progs/Makefile +index 313dc4d..3c3dc97 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS) + + install: all + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) +- for p in $(PROGS) ; do \ ++ for p in $(PROGS) capsh ; do \ + install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \ + done + ifeq ($(RAISE_SETFCAP),yes) + $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap + endif + +-test: $(PROGS) ++test: $(PROGS) capsh + + capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh + ./mkcapshdoc.sh > $@ +-- +2.32.0.rc2 + diff --git a/sys-libs/libcap/libcap-2.49.ebuild b/sys-libs/libcap/libcap-2.49.ebuild index 46812d6c1098..48e28fcd6555 100644 --- a/sys-libs/libcap/libcap-2.49.ebuild +++ b/sys-libs/libcap/libcap-2.49.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P} # it's available under either of the licenses LICENSE="|| ( GPL-2 BSD )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="pam static-libs" # While the build system optionally uses gperf, we don't DEPEND on it because diff --git a/sys-libs/libcap/libcap-2.50-r1.ebuild b/sys-libs/libcap/libcap-2.50-r1.ebuild new file mode 100644 index 000000000000..2745eb56bf9d --- /dev/null +++ b/sys-libs/libcap/libcap-2.50-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal toolchain-funcs pam usr-ldscript + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="https://sites.google.com/site/fullycapable/" +SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" + +# it's available under either of the licenses +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="pam static-libs" + +# While the build system optionally uses gperf, we don't DEPEND on it because +# the build automatically falls back when it's unavailable. #604802 +RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]" +PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + ${PDEPEND} + sys-kernel/linux-headers" + +# Requires test suite being run as root (via sudo) +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-2.50-build-system-fixes.patch + "${FILESDIR}"/${PN}-2.50-install_capsh_again.patch #793026 + "${FILESDIR}"/${PN}-2.38-no_perl.patch + "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch + "${FILESDIR}"/${PN}-2.21-include.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +run_emake() { + local args=( + exec_prefix="${EPREFIX}" + lib_prefix="${EPREFIX}/usr" + lib="$(get_libdir)" + prefix="${EPREFIX}/usr" + PAM_CAP="$(usex pam yes no)" + DYNAMIC=yes + GOLANG=no + CC="$(tc-getCC)" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + ) + emake "${args[@]}" "$@" +} + +src_configure() { + tc-export AR CC RANLIB + tc-export_build_env BUILD_CC + multilib-minimal_src_configure +} + +multilib_src_compile() { + run_emake +} + +multilib_src_install() { + # no configure, needs explicit install line #444724#c3 + run_emake DESTDIR="${D}" install + + gen_usr_ldscript -a cap + gen_usr_ldscript -a psx + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die + fi + + if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then + rm -r "${ED}"/usr/$(get_libdir)/security || die + fi + + if use pam ; then + dopammod pam_cap/pam_cap.so + dopamsecurity '' pam_cap/capability.conf + fi +} + +multilib_src_install_all() { + dodoc CHANGELOG README doc/capability.notes +} diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 21fc6a8b8c82..bad1472d2164 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -5,9 +5,11 @@ DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b 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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 +DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e 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.0.9999.ebuild 6622 BLAKE2B b525c9be28a7ac16ec07275c59e68fb003a7423512c94c297014f884d40323b6776313ced81e09f5e15cc1489e95e42b561f8e3e961bc461b37e58ab928edf62 SHA512 335d114c131ed3a6653f59f3a66bdb4115f277b2d8aacd3c2fbc78519b9fdaedaade3a2f53a66f36c18feb3cde8a6fb95fe8e34889626c17dd896bd6a8f8cfad EBUILD libcxx-12.0.0.ebuild 6914 BLAKE2B e06a7f82b838785de55c9c936cedd9d4bd3ca819812cf43a98ce533c5f7551d60dec4040f11820068850a23af1111d0a156d398ad8dafefbcc301ed41254855f SHA512 76afcac7759e44a70bc10adc1217446c7c1665f9f1264c2c49363732023e684683df2490d0bc4abd565a04ca1dbf355c8e1bc4d7b88bb2932e0fe35527e0e746 +EBUILD libcxx-12.0.1.9999.ebuild 6622 BLAKE2B b525c9be28a7ac16ec07275c59e68fb003a7423512c94c297014f884d40323b6776313ced81e09f5e15cc1489e95e42b561f8e3e961bc461b37e58ab928edf62 SHA512 335d114c131ed3a6653f59f3a66bdb4115f277b2d8aacd3c2fbc78519b9fdaedaade3a2f53a66f36c18feb3cde8a6fb95fe8e34889626c17dd896bd6a8f8cfad +EBUILD libcxx-12.0.1_rc1.ebuild 6622 BLAKE2B b525c9be28a7ac16ec07275c59e68fb003a7423512c94c297014f884d40323b6776313ced81e09f5e15cc1489e95e42b561f8e3e961bc461b37e58ab928edf62 SHA512 335d114c131ed3a6653f59f3a66bdb4115f277b2d8aacd3c2fbc78519b9fdaedaade3a2f53a66f36c18feb3cde8a6fb95fe8e34889626c17dd896bd6a8f8cfad EBUILD libcxx-13.0.0.9999.ebuild 6622 BLAKE2B b525c9be28a7ac16ec07275c59e68fb003a7423512c94c297014f884d40323b6776313ced81e09f5e15cc1489e95e42b561f8e3e961bc461b37e58ab928edf62 SHA512 335d114c131ed3a6653f59f3a66bdb4115f277b2d8aacd3c2fbc78519b9fdaedaade3a2f53a66f36c18feb3cde8a6fb95fe8e34889626c17dd896bd6a8f8cfad MISC metadata.xml 621 BLAKE2B d8b68920ece0e3a700f1e425cf72a4ca7e75cf4b0b35e1ac6db9374d32020fc9f62b434da2108ad5b3538a46a2a7f4f5de7aa1640cd4b10046f2480ebb89450d SHA512 e1b0c874a6d229e098ffe7c0c2827502f2cdbf74fb7a0254687a0ca75dde74db06ef2bc79bfe8b526c413b13beac27b8261eab8d0b8df36011790dada3eae421 diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild index 1f529867fb7b..1f529867fb7b 100644 --- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-12.0.1.9999.ebuild diff --git a/sys-libs/libcxx/libcxx-12.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-12.0.1_rc1.ebuild new file mode 100644 index 000000000000..1f529867fb7b --- /dev/null +++ b/sys-libs/libcxx/libcxx-12.0.1_rc1.ebuild @@ -0,0 +1,211 @@ +# 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/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +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? ( + >=dev-util/cmake-3.16 + >=sys-devel/clang-3.9.0 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + )" + +DOCS=( CREDITS.TXT ) + +LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +LLVM_PATCHSET=9999-1 +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # Darwin Prefix builds do not have llvm installed yet, so rely on + # bootstrap-prefix to set the appropriate path vars to LLVM instead + # of using llvm_pkg_setup. + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then + llvm_pkg_setup + fi + 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 + elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then + # clang-based darwin prefix disables libunwind useflag during + # bootstrap, because libunwind is not in the prefix yet. + # override the default, though, because clang based libcxx + # should never use gcc_s on Darwin. + want_gcc_s=OFF + # compiler_rt is not available in EPREFIX during bootstrap, + # so we cannot link to it yet anyway, so keep the defaults + # of want_compiler_rt=OFF and extra_libs=() + 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}" + -DPython3_EXECUTABLE="${PYTHON}" + ) + fi + cmake_src_configure +} + +multilib_src_test() { + local -x LIT_PRESERVES_TMP=1 + cmake_build check-cxx +} + +# 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 + if [[ ${CHOST} != *-darwin* ]] ; then + gen_shared_ldscript + use static-libs && gen_static_ldscript + fi +} + +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/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 9d6c56bb239f..be21b3d8a287 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -1,9 +1,11 @@ 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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 +DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e 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.0.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b EBUILD libcxxabi-12.0.0.ebuild 3546 BLAKE2B b6accd4747ac9a1b30161de15e961062819e527c39a4d8a6e755e58a75862b1b12162539bf9716db2be8739b9aa2fefe16cede125b504e9d5e2d60f291fe8e35 SHA512 2fb42faa0ac7d7e5d1651494264163857561eb746ea381030bf03495152c8c060cb0be0793ba96f1ec5c4c9e3ea88b48644f587b4f52979c7eadad6992809e0a +EBUILD libcxxabi-12.0.1.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b +EBUILD libcxxabi-12.0.1_rc1.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b EBUILD libcxxabi-13.0.0.9999.ebuild 3505 BLAKE2B fe4d762e646ab8a6daad3ca1da7d63c34ffb6735a6bb6657e03e724428422706d821057715369cd818ecc696453620d7f2473535ac031ec0cc0a5bc6f4ec2186 SHA512 40ce77407d30efc2ada70d0166bcadbc4140e33275ecf537dcbd7580e3e8fc9ff030a29ba6be4a67bcadc9835ee8b1a2cd3fef07085c57df4792c04b445b0d7b MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild index 8c24d9691115..8c24d9691115 100644 --- a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-12.0.1.9999.ebuild diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc1.ebuild new file mode 100644 index 000000000000..8c24d9691115 --- /dev/null +++ b/sys-libs/libcxxabi/libcxxabi-12.0.1_rc1.ebuild @@ -0,0 +1,122 @@ +# 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/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +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}]') + )" + +# libcxx is needed uncondtionally for the headers +LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules ) +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix + # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup. + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then + llvm_pkg_setup + fi + 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}" + -DPython3_EXECUTABLE="${PYTHON}" + ) + 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-cxxabi +} + +multilib_src_install_all() { + insinto /usr/include/libcxxabi + doins -r include/. +} diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index 7595fa6de63c..792825390737 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,9 +1,11 @@ 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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 +DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e 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.0.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157 EBUILD libomp-12.0.0.ebuild 2951 BLAKE2B 347b96e146742f7127314e3eb35ee13a3f040b3ab87aba7570a12cf1a2d44f918b110059d7a821b349224b7233d13be0ad110acf5cd2e4328762ed1e52bd665a SHA512 acb0a94b89b6f9f7a67a8cb20976e0cf0cfddc05d3e7fcd198d4cf3ab3742f5b80f88c4b39be71d3c89201010f936bf4981736ed2a21975b0a43e3898cc90693 +EBUILD libomp-12.0.1.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157 +EBUILD libomp-12.0.1_rc1.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157 EBUILD libomp-13.0.0.9999.ebuild 2885 BLAKE2B a4ae00d8e2500cc8c76999c17624a3a2ebe6107c34f9deb90cb12de77c4656dd110275e073ab9413332f0fa9c2a86d860a620c85a36555e5996d358c1e25e522 SHA512 ba72ef7a346ac74297526df15949395a18750625b048c26650a7cdec4212af72dcb2b9c8d68dc117abeb7bce9aba4f0b0de1134bcacd841d1a475f77f4a77157 MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762 diff --git a/sys-libs/libomp/libomp-12.0.0.9999.ebuild b/sys-libs/libomp/libomp-12.0.1.9999.ebuild index 0fd7afe0ff42..0fd7afe0ff42 100644 --- a/sys-libs/libomp/libomp-12.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-12.0.1.9999.ebuild diff --git a/sys-libs/libomp/libomp-12.0.1_rc1.ebuild b/sys-libs/libomp/libomp-12.0.1_rc1.ebuild new file mode 100644 index 000000000000..0fd7afe0ff42 --- /dev/null +++ b/sys-libs/libomp/libomp-12.0.1_rc1.ebuild @@ -0,0 +1,106 @@ +# 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 linux-info llvm.org python-any-r1 + +DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" +HOMEPAGE="https://openmp.llvm.org" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +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 + )" + +LLVM_COMPONENTS=( openmp llvm/include ) +llvm.org_set_globals + +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++")" + ) + addpredict /dev/nvidiactl + cmake_src_configure +} + +multilib_src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + + cmake_build check-libomp +} diff --git a/sys-libs/librtas/Manifest b/sys-libs/librtas/Manifest index 611f0a58f2a9..b9b1ae0b3298 100644 --- a/sys-libs/librtas/Manifest +++ b/sys-libs/librtas/Manifest @@ -1,3 +1,4 @@ +AUX librtas-2.0.2-musl.patch 1073 BLAKE2B 51c0ff8a61aa16409f43abb4171b790308565baef19f9d74596f2c3bb0feab5538cbbc60133e95706b116dc68c957b69dc280fa3a75396812f09f227d032328e SHA512 d461f8f9fc11ea81c4b9847f4fd36fe1498d90df414a3e31daa7a385435267edee5ff851382a7c8c1c575ff1ec09c3612ee59bd882196ce270f8c41ddd3ee629 DIST librtas-2.0.2.tar.gz 91627 BLAKE2B 1455af1af4a932fb81815ba67d1d1d8eeb0866bcf49fdcced622c1982121b5bb3ddeaf78f121a6540ec6c60d641991a87342713478a5be5232128db35d272059 SHA512 112d355bc486657289a186d9f1b8c576af55422f1527259a0cd680c07d6fa787aef2dc0cb6322721dc4aa1c5bd1de669f5c4d05e6a07de65262e9e3d4d0283c7 -EBUILD librtas-2.0.2-r1.ebuild 685 BLAKE2B fb11be8aba1ed03a3339f86a3a08b2f5a6605323bb0db6f32db88cd26949138aba4f1bb92b7f3648d57d25cbcc05ef11a70f82118cde63691593aa024247bf86 SHA512 3ef8d2c1e45c0f8894aed073ee3097ce7043fdf72e99aaea760363f943f3c9d3136ad330f680683f45767126fa40a44d348f7c43a4b017e864020cb7dad8108f +EBUILD librtas-2.0.2-r1.ebuild 728 BLAKE2B ebc8a29955fbd67f30c4c9a2bb2f367185e752f0271f7b3fcabaec1fe99fdb499d4400209809c5840ae005d545a3bd17c2aaba384b4b6c69441f3aac531e3089 SHA512 035abe76ed04cf1dd43974e29f936f63bd3969ff8585fb066b9a09edea113667706a51a46d3e8744766fe4e37ff72e310dfd101c6aae0ee15ee307af573b83fa MISC metadata.xml 340 BLAKE2B d84ae6cde9ffd7cc2476c3ef90d6125e65946795711e4c5a422e244a2369ac059fc0f22e038c687c5e871370e4384694b5d464abcb76097ab065149de35ef17e SHA512 54fcb0b54320053eb1f68f11107e8027a618351a78d539de2dffaad678aabe9b20972700af6ac2ba4bfa589c91e1cd2d91df517ab745ad365b1ad1ba7a4b0f3e diff --git a/sys-libs/librtas/files/librtas-2.0.2-musl.patch b/sys-libs/librtas/files/librtas-2.0.2-musl.patch new file mode 100644 index 000000000000..a0e92f17fcb1 --- /dev/null +++ b/sys-libs/librtas/files/librtas-2.0.2-musl.patch @@ -0,0 +1,30 @@ +From caa55523aca6997d55fc9c68ed121c2c2bccc569 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen <grobian@gentoo.org> +Date: Mon, 24 May 2021 10:06:54 +0200 +Subject: [PATCH] librtasevent: include endian.h for beXXtoh macros + +In particular using musl libc, without this include, the calls to +be16toh/be32toh result in a compiler warning about an undefined symbol. +Since in musl these are actually implemented by macros, the symbols +remain undefined in the final shared library, making the library +unusable. + +Issue: https://github.com/ibm-power-utilities/librtas/issues/10 +Signed-off-by: Fabian Groffen <grobian@gentoo.org> +--- + librtasevent_src/rtas_event.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/librtasevent_src/rtas_event.h b/librtasevent_src/rtas_event.h +index ece6f1d..b38cd7a 100644 +--- a/librtasevent_src/rtas_event.h ++++ b/librtasevent_src/rtas_event.h +@@ -23,6 +23,8 @@ + #ifndef _H_RTAS_EVENT + #define _H_RTAS_EVENT + ++#include <endian.h> ++ + #define PRNT_FMT "%-20s%08x" + #define PRNT_FMT_L PRNT_FMT" " + #define PRNT_FMT_R PRNT_FMT"\n" diff --git a/sys-libs/librtas/librtas-2.0.2-r1.ebuild b/sys-libs/librtas/librtas-2.0.2-r1.ebuild index ec20aa395889..61863ff24d39 100644 --- a/sys-libs/librtas/librtas-2.0.2-r1.ebuild +++ b/sys-libs/librtas/librtas-2.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,6 +13,8 @@ SLOT="0" KEYWORDS="ppc ppc64 ~ppc64-linux" IUSE="static-libs" +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + src_prepare() { default eautoreconf diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index 5303f1ccde35..2a0ade17f1e4 100644 --- a/sys-libs/libseccomp/Manifest +++ b/sys-libs/libseccomp/Manifest @@ -1,10 +1,6 @@ -DIST libseccomp-2.4.3.tar.gz 598147 BLAKE2B 272c9f1ca7e4059790f633a79cae8612831aa483d28630fb85b31dc2be0192907a8897819d835b61324e0b3fb0d77b8781e2a85e9750ef8d7974d8680b8cdea3 SHA512 7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef -DIST libseccomp-2.4.4.tar.gz 604420 BLAKE2B 04a2e22996d94f2525c1f4a890f325e7c75abb7ac84928a1ffde5e4cc569ef6355fcda8415e0c9937139e187f458602714cfd042008de74637c7bf30e9bd58e2 SHA512 53e5aa338a1c30ce826551e33be6ef877af43b1d8cfd2e1b6ffb70789eb2070d2610fb7cb5cec4a3a4c4a1221767f867f3d2bc07b6b1d9742719b1e053630b24 -DIST libseccomp-2.5.0.tar.gz 638793 BLAKE2B c1f30624e210d632175b734c49411ee3f95e8f0ee68819ad83a342434231baef10c292f23fca0127394365a37efb043f9f24ade9534deecd61f50e7111a6fbc8 SHA512 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae +AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af -EBUILD libseccomp-2.4.3.ebuild 1033 BLAKE2B b8f0ab2c71319953287e4ad85c0ce0955bb5f4cb775e3a76c29522a3223296e20a820a8015c3f1a4f1ba871fbbf3c4400f65aaadc63ec4ab72aabb7cb3427b6c SHA512 25eab36a52b84f109abec338d4f0c315c7714abdfa07bfdbdff8f9e65e2c65ff9e857fca89ba6e110835cb91416df4b67c65ca5612f7d004c2a0da5f1f911c02 -EBUILD libseccomp-2.4.4.ebuild 1033 BLAKE2B b8f0ab2c71319953287e4ad85c0ce0955bb5f4cb775e3a76c29522a3223296e20a820a8015c3f1a4f1ba871fbbf3c4400f65aaadc63ec4ab72aabb7cb3427b6c SHA512 25eab36a52b84f109abec338d4f0c315c7714abdfa07bfdbdff8f9e65e2c65ff9e857fca89ba6e110835cb91416df4b67c65ca5612f7d004c2a0da5f1f911c02 -EBUILD libseccomp-2.5.0.ebuild 1949 BLAKE2B bcecd01bcbfa1e7d3efa6ea6808d5e9e3d1a029596d486a3a716b7fd613a163dafd6e036233ae1014190eacdfaab6e01f2a09f2bb754c052dc59c8a592836103 SHA512 b09eb1a9895bb0ce45eb41f623419a6976feaaff5ef10d4726fa94a362f325f424b40ec813cffef93adf652a1a3ef48eaee7dc6500e20b009508ac7d4f20abfe -EBUILD libseccomp-2.5.1.ebuild 1987 BLAKE2B 12d3454c73d6df8cd486a0cbf3074bfd22bd84c83a6bd3c122f9b10c9c6ba50673cd40a2d2701e0eaf2e8fe7c12fe6ce7d55c022f1b41dc04e81b4eb15810733 SHA512 c37c4f2cd29baa6d63b9f6a47843d55a7e25000d86885a50592a160711e285d685abaada0b28f7975034365b322661df02d32fd5f74f625ebc03f2efd53c0cdd -EBUILD libseccomp-9999.ebuild 1994 BLAKE2B fc3087eab99a3760febb6996beef0018c25b071d4143a06ec94f4898c846cbb1399009d42af45aed4e09e691aec3e5e3ef00488136479fc2ef7975dc3b735c19 SHA512 f834293582bc68e2e381e81b3ab0db49ff8748df113b39cec396be1069e3ffd6f7d1436040344edbeebc1c1ff581dec73d68eb4a06151644e7e03266b03e2261 +EBUILD libseccomp-2.5.1-r1.ebuild 2336 BLAKE2B 29fac73807ed8d1da2f8e233eca53e0892fd4eb973f80404622d524b90d11acab8d428c87699b6c8085c591fb65b0a355ab335f2ea6b7335ed45c9f267ac04f8 SHA512 e917b8877228a235b2c4fc5665736b2f224d078503de6132e07d9f8d7079875b12c1729177fa6dc69bf604f740266941872735d09b84d1075180d07c29fd2cca +EBUILD libseccomp-2.5.1.ebuild 2015 BLAKE2B 42a902f6c0abe87bead4723428f287bdf730d0718265a2cd98aa0b9af3f8cf9094831a9743f9e8b43de811eb5a7cca89657cd529c90abaae018cb0017c51777a SHA512 9f46b611420ae1adbe84a0aa2b1e8b1aff83d8d93a34172b6909bee845089a5eb8d0a871cdc576839fcd02837e701a8b30fa8273df1592945b7efa963dad9c26 +EBUILD libseccomp-9999.ebuild 2336 BLAKE2B 29fac73807ed8d1da2f8e233eca53e0892fd4eb973f80404622d524b90d11acab8d428c87699b6c8085c591fb65b0a355ab335f2ea6b7335ed45c9f267ac04f8 SHA512 e917b8877228a235b2c4fc5665736b2f224d078503de6132e07d9f8d7079875b12c1729177fa6dc69bf604f740266941872735d09b84d1075180d07c29fd2cca MISC metadata.xml 468 BLAKE2B f09a751736d4f5f5b5d1cacfbbce2280f2c07f2a435882e833ecd0db3f363ae9e4e7aafaea23d21946279fef27a55d93af9549d75a5f929d6a965dc82f53cfb6 SHA512 3fb402831ab2522948f9514cf0dfad2ed1b035c773eeadb78d958766b92b480b1fb55a274e0990f1913b5be5e4c7de734f8f691f4b3c111949f68f604fb3edc9 diff --git a/sys-libs/libseccomp/files/libseccomp-python-shared.patch b/sys-libs/libseccomp/files/libseccomp-python-shared.patch new file mode 100644 index 000000000000..93e1ec8a9156 --- /dev/null +++ b/sys-libs/libseccomp/files/libseccomp-python-shared.patch @@ -0,0 +1,25 @@ +From 763b863c3028f604f16cc6d2de7452dc16458596 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 23 May 2021 16:17:32 -0400 +Subject: [PATCH] Link python module against shared library + +--- + src/python/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/setup.py b/src/python/setup.py +index 0419111..fb650d0 100755 +--- a/src/python/setup.py ++++ b/src/python/setup.py +@@ -41,7 +41,7 @@ setup( + ext_modules = [ + Extension("seccomp", ["seccomp.pyx"], + # unable to handle libtool libraries directly +- extra_objects=["../.libs/libseccomp.a"], ++ extra_objects=["../.libs/libseccomp.so"], + # fix build warnings, see PEP 3123 + extra_compile_args=["-fno-strict-aliasing"]) + ] +-- +2.32.0.rc1 + diff --git a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild deleted file mode 100644 index f6e555a5b8d7..000000000000 --- a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: Add python support. - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="high level interface to Linux seccomp filter" -HOMEPAGE="https://github.com/seccomp/libseccomp" -SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -# 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=">=sys-kernel/linux-headers-4.3" - -src_prepare() { - default - sed -i \ - -e '/_LDFLAGS/s:-static::' \ - tools/Makefile.in || die -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - --disable-python - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "${PN}.la" -delete || die - einstalldocs -} diff --git a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild b/sys-libs/libseccomp/libseccomp-2.4.4.ebuild deleted file mode 100644 index f6e555a5b8d7..000000000000 --- a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# TODO: Add python support. - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="high level interface to Linux seccomp filter" -HOMEPAGE="https://github.com/seccomp/libseccomp" -SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -# 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=">=sys-kernel/linux-headers-4.3" - -src_prepare() { - default - sed -i \ - -e '/_LDFLAGS/s:-static::' \ - tools/Makefile.in || die -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - --disable-python - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name "${PN}.la" -delete || die - einstalldocs -} diff --git a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild index d03ab2456c99..c445290913e2 100644 --- a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild +++ b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 multilib-minimal @@ -17,31 +18,29 @@ if [[ ${PV} == *9999 ]] ; then 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" + 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" -REQUIRED_USE=" - python? ( - static-libs - ${PYTHON_REQUIRED_USE} - )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -BDEPEND=" +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} dev-util/gperf - python? ( ${PYTHON_DEPS} ) + python? ( dev-python/cython[${PYTHON_USEDEP}] ) " -DEPEND="${BDEPEND}" -RDEPEND="${DEPEND}" - # 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" + ) default if [[ "${PV}" == *9999 ]] ; then sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac @@ -57,16 +56,24 @@ multilib_src_configure() { 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 - cd "${S}/src/python" || die - sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \ - -e "/extra_objects/s,\.\.,${OLDPWD}/src," \ - setup.py || die - local -x CPPFLAGS="-I${OLDPWD}/include -I../../include" - distutils-r1_src_compile + # 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 } @@ -74,8 +81,7 @@ multilib_src_install() { emake DESTDIR="${D}" install if multilib_is_native_abi && use python ; then - cd "${S}/src/python" || die - distutils-r1_src_install + do_python distutils-r1_src_install fi } diff --git a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild index b68cd3835b8d..169a677b6cf6 100644 --- a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild +++ b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild @@ -5,6 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 multilib-minimal diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild index 9df6cc592e47..c445290913e2 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -5,6 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 multilib-minimal @@ -24,11 +25,7 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="python static-libs" -REQUIRED_USE=" - python? ( - static-libs - ${PYTHON_REQUIRED_USE} - )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" @@ -41,6 +38,9 @@ BDEPEND="${DEPEND} DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + ) default if [[ "${PV}" == *9999 ]] ; then sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac @@ -56,16 +56,24 @@ multilib_src_configure() { 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 - cd "${S}/src/python" || die - sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \ - -e "/extra_objects/s,\.\.,${OLDPWD}/src," \ - setup.py || die - local -x CPPFLAGS="-I${OLDPWD}/include -I../../include" - distutils-r1_src_compile + # 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 } @@ -73,8 +81,7 @@ multilib_src_install() { emake DESTDIR="${D}" install if multilib_is_native_abi && use python ; then - cd "${S}/src/python" || die - distutils-r1_src_install + do_python distutils-r1_src_install fi } diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest index e7ded52bcb6c..ed9c68044c93 100644 --- a/sys-libs/libstdc++-v3/Manifest +++ b/sys-libs/libstdc++-v3/Manifest @@ -1,4 +1,4 @@ DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed -EBUILD libstdc++-v3-3.3.6-r2.ebuild 4903 BLAKE2B c25085fdbfd7127adb8249ec9130708dfc421822fade2f5dbfd5df8a4a1944ea26843ae80cffec1f54bdee0c12a7f24dccf6006eb07d3020bf0dbe7da536ec05 SHA512 bcea5025c19f7ea41b3989f6b2d42084bc92ad8f944f19c8bc5d13163ba6ed23afcf03f87534414d69e2da3e2ecd607ff7ecb08981302c47ca31b59b47a2cad6 +EBUILD libstdc++-v3-3.3.6-r3.ebuild 4930 BLAKE2B 39aeee828c80114c5b30c223a84a2e37f4ebd718593431b154dcf8a54a194e51f11684d311775074c88d7ea6900f0e70eaef0dae889832716fd306331857778e SHA512 d5ee7221b0a8e1bb9dc6ead6509babe2cd10aabc26e0806ed1a5e3b826ef189bcc1a55df82546b159a0b82cd040d864b78be9ed2db780ccb2bf763ac6bd7f7ae MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1 diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r3.ebuild index ad1fd1f8e097..2e11d8135f0d 100644 --- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r2.ebuild +++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r3.ebuild @@ -17,8 +17,10 @@ SLOT="5" KEYWORDS="~amd64 ~x86" IUSE="multilib nls" -DEPEND="sys-devel/bison" -RDEPEND="" +RDEPEND="sys-libs/zlib" +DEPEND=" + ${RDEPEND} + sys-devel/bison" transform_known_flags() { declare setting diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest index 1bcc7a3c8ccb..eab3a9bed783 100644 --- a/sys-libs/libutempter/Manifest +++ b/sys-libs/libutempter/Manifest @@ -1,7 +1,3 @@ -DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede -DIST libutempter-1.2.0.tar.gz 17353 BLAKE2B 35e66a32e70fa59639f9a4fb71ba0e89c88aedac04e389cd29397c935daea66bd9f4f04795c977911f136b121d0445f79c0090a60a0353d04af98fe6b9b9ee09 SHA512 24b9fb59269b48bfee397520907c74746a7a38cf12cc002a8adcdd930460036caea7c72fe47b93badf678dc8306786bf4d87f23ee696a524bfc93722ea1eed23 DIST libutempter-1.2.1.tar.gz 17429 BLAKE2B 88ae0a03a8a614b960082ce4d4006ec4e3eb8148b319ae964ac3ba3f684f08f5dd670e693f25d52d04a280f7b2aed6d2894cbbc0e2db3f71ab68e6910ffb58d1 SHA512 d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429 -EBUILD libutempter-1.1.6-r3.ebuild 1565 BLAKE2B f53748b5ac0a11d8e0bc05f91e584cc98360096b69e7e08db71f0aa7a7af7dbbc26e6c06e589e79d142fcd8b2fdeefa3e94a7dec841271430109b04cd5a0cbde SHA512 03c8046a26ea3a3e269d49dd2ff96e45f50daa704f6a2f4973acd13e4e54287bf81eb02de313e8f6b298022f0b6719767f4b6a99e63600ea20f4ae7f9e1ee40a -EBUILD libutempter-1.2.0.ebuild 1574 BLAKE2B af93129e8e46d48977500512f314c67a68ee3d38a87e5017a8c20794592d4966f8ed49fc92a2dcc049c489af037643a0886dcf3ca704a2f2edcd59aafc5fbc6d SHA512 f85a9e76740000f204ce2e1af77d8cd7cbcc317c578df84a4590ccabd7f84ec980307b2d17fed1ebcab6921e4ee78f97f3e08e17074980d588e0f7ff48bdb7f2 -EBUILD libutempter-1.2.1.ebuild 1582 BLAKE2B 73554273676e185d25cc6580aee654bba345be8d596777d80bb76e1d8ad06eb94e22d27ac11989634878ddeeb1ec6eb4ec78e55e0c79868e8fe0076def1f14e2 SHA512 a130f633f970daa98657e9ff198d3c5eaa24e9421c6a8a4688b8ca6e2639f11f683a184ae2bb19b592caf8a3207135743faf55c98637466d20953fa9debf80be +EBUILD libutempter-1.2.1.ebuild 1575 BLAKE2B 00f5fddba51282408f7a87010ef3b39810e7878d44b25ffe36b36bcf7154db2e244701bbb7b39db609d84d15c84dbd39ac60157ac5919b32350e7ce88f0ece28 SHA512 bd038802a9483698f1be7a5f8cf91a7e7c100050d1e83345f3ee6964f061aadf38436c88ac0275d391d3926f088176e74d818c38b7b8ce8ce6a04f94256d799d MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild deleted file mode 100644 index 326b59190559..000000000000 --- a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info" -HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter" -SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs elibc_FreeBSD" - -RDEPEND=" - !sys-apps/utempter - acct-group/utmp -" - -src_prepare() { - default - - local args=( - -e "/^libdir /s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" - -e '/^libexecdir /s:=.*:= $(libdir)/misc:' - -e '/^CFLAGS = $(RPM_OPT_FLAGS)/d' - -e 's:,-stats::' - -e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:" - -e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:" - ) - - if ! use static-libs ; then - args+=( - -e '/^STATICLIB/d' - -e '/INSTALL.*STATICLIB/d' - ) - fi - - sed -i "${args[@]}" Makefile || die -} - -src_configure() { - use elibc_FreeBSD && append-libs -lutil - tc-export AR CC -} - -src_compile() { - emake LDLIBS="${LIBS}" -} - -src_install() { - default - - if ! use prefix ; then - fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter - fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter - fi - - dodir /usr/sbin - dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter -} - -pkg_postinst() { - local path - for path in "${EROOT}"/var/log/{w,u}tmp; do - chown root:utmp "${path}" - chmod 664 "${path}" - done -} diff --git a/sys-libs/libutempter/libutempter-1.2.0.ebuild b/sys-libs/libutempter/libutempter-1.2.0.ebuild deleted file mode 100644 index 1df07ce3ed22..000000000000 --- a/sys-libs/libutempter/libutempter-1.2.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info" -HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter" -SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs elibc_FreeBSD" - -RDEPEND=" - !sys-apps/utempter - acct-group/utmp -" - -src_prepare() { - default - - local args=( - -e "/^libdir /s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" - -e '/^libexecdir /s:=.*:= $(libdir)/misc:' - -e '/^CFLAGS = $(RPM_OPT_FLAGS)/d' - -e 's:-Wl,-stats::' - -e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:" - -e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:" - ) - - if ! use static-libs ; then - args+=( - -e '/^STATICLIB/d' - -e '/INSTALL.*STATICLIB/d' - ) - fi - - sed -i "${args[@]}" Makefile || die -} - -src_configure() { - use elibc_FreeBSD && append-libs -lutil - tc-export AR CC -} - -src_compile() { - emake LDLIBS="${LIBS}" -} - -src_install() { - default - - if ! use prefix ; then - fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter - fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter - fi - - dodir /usr/sbin - dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter -} - -pkg_postinst() { - local path - for path in "${EROOT}"/var/log/{w,u}tmp; do - chown root:utmp "${path}" - chmod 664 "${path}" - done -} diff --git a/sys-libs/libutempter/libutempter-1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.2.1.ebuild index a6b93b7b049f..4e871a42e930 100644 --- a/sys-libs/libutempter/libutempter-1.2.1.ebuild +++ b/sys-libs/libutempter/libutempter-1.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs elibc_FreeBSD" RDEPEND=" diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 59aa83330d51..342c49026863 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -1,9 +1,11 @@ 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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 +DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de EBUILD llvm-libunwind-11.1.0.ebuild 3223 BLAKE2B c39bdefd6bf0656db7d84f3cd868da01aa4b37f51c729951d1bcb73336f6ab1d8beb114a7d10d79c1441ce945b03aaf9444481e5e1b3e7dd7fdb9a7e971c451d SHA512 ad8cb081326e4dd6cd888882fabcc3fa1a152c37b28197c9565d46d8f8419f233a1a9f6cc9f3bcfe4ba1441cf97147dafb684e3eb60453020d2b64ccfb56d1c1 -EBUILD llvm-libunwind-12.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591 EBUILD llvm-libunwind-12.0.0.ebuild 3239 BLAKE2B 04a0b9de0107e28b22fbbe4e94e55969cdd7040710e3d76d8f2c57ef820d556463cb8bda5b450221383f48b989cd923ce3ec3fd63a1514d8e6b95f4a91d797cb SHA512 6ff67dcd84b49c8092a18e27b4e9db3a745c1e77035d86134b8ff1150010f1f3e3b993d99d04c60529594df6e5b2260c0d1c01746dac333ef7e70fea9c1e257a +EBUILD llvm-libunwind-12.0.1.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591 +EBUILD llvm-libunwind-12.0.1_rc1.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591 EBUILD llvm-libunwind-13.0.0.9999.ebuild 3191 BLAKE2B c6d413951aed1e093b629506afdb3f76f5887239dc4aedd1d9f7063549d2cad5b286d253df25aacb20116ad6ac6f85453d357eb96de02611d18d5f136d62ebc4 SHA512 99693bac2c943e756f4c7b586d78add1811f91c0bf9bad235bb9a9feb4df1edb779d1e01759ff86a484e48a8bca2ebd6740d5a4c4cdf9dbddab6ebc6a0bd8591 MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.9999.ebuild index bf538b66689b..bf538b66689b 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.9999.ebuild diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1_rc1.ebuild new file mode 100644 index 000000000000..bf538b66689b --- /dev/null +++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1_rc1.ebuild @@ -0,0 +1,124 @@ +# 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" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +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}]') + )" + +LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules ) +LLVM_TEST_COMPONENTS=( libcxxabi ) +llvm.org_set_globals + +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=ONF + -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/talloc/Manifest b/sys-libs/talloc/Manifest index 551e6a12b25c..e28bbbcb9b5e 100644 --- a/sys-libs/talloc/Manifest +++ b/sys-libs/talloc/Manifest @@ -1,5 +1,3 @@ -DIST talloc-2.3.1.tar.gz 638878 BLAKE2B 3d014a47639434c65f5dda2c51da3c6c28d5d60dbc9afdaca27b8ec903cde3433a8fa4ca33305750ff60911f7e43171d0d932d98c2d30ea38494aa532d6d9626 SHA512 064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1 -EBUILD talloc-2.3.1.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097 EBUILD talloc-2.3.2.ebuild 3424 BLAKE2B 560a71b2392812d40361647d548ed8b5e99f4fa40ba85ee8d1fa88194b4f63722b28209247ac05b05fc5252c6fbcaa37ff934debe3a9c4604b69f4f4f7ca4c12 SHA512 de4dff8f5d23a3ea40ad1dfbfcb4d4766d34779a9884bad411559c91ec12dd2cff0e08a020a5e62e32bd3b96efc0328624ab3ee650ffa3b41b1b8640e8bf0097 -MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3 +MISC metadata.xml 325 BLAKE2B 9c8711270f9afc5d7ec24204c9d74ab94fb2fb3ebccc65d77386725e9f9694838aa71c068c9754971bd6e404dc4ed1bc8bc40b1a4277ffe78415cae6d64c30c2 SHA512 a87ba9777fd7d2007cce3e495ccff8a6f0a7e86379f28dede1e1940c0da95f4690319cf7212b683464a4b265c043f80e80070dc306a0c9cb625080f6e1e85d68 diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml index afa647617059..72b988ab3e33 100644 --- a/sys-libs/talloc/metadata.xml +++ b/sys-libs/talloc/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> <maintainer type="project"> <email>samba@gentoo.org</email> <name>Samba</name> diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild deleted file mode 100644 index 851fdbb724c4..000000000000 --- a/sys-libs/talloc/talloc-2.3.1.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 waf-utils python-single-r1 multilib-minimal - -DESCRIPTION="Samba talloc library" -HOMEPAGE="https://talloc.samba.org/" -SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz" - -LICENSE="GPL-3 LGPL-3+ LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="compat +python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" - -RDEPEND=" - !elibc_FreeBSD? ( - !elibc_SunOS? ( - !elibc_Darwin? ( - dev-libs/libbsd[${MULTILIB_USEDEP}] - ) - ) - ) - python? ( ${PYTHON_DEPS} ) - !!<sys-libs/talloc-2.0.5 -" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - sys-devel/gettext -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( - # python goes only for native - /usr/include/pytalloc.h -) - -pkg_setup() { - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - python-single-r1_pkg_setup -} - -src_prepare() { - default - - if [[ ${CHOST} == *-darwin* ]] ; then - # Drop irritating ABI names (e.g. cpython-37m) - # We're only installing one implementation anyway - sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die - sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die - fi - - # what would you expect of waf? i won't even waste time trying. - multilib_copy_sources -} - -multilib_src_configure() { - local extra_opts=( - $(usex compat --enable-talloc-compat1 '') - $(multilib_native_usex python '' --disable-python) - $([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions') - ) - waf-utils_src_configure "${extra_opts[@]}" -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # waf is stupid, and no, we can't fix the build-system, since it's provided - # as a brilliant binary blob thats decompressed on the fly - if [[ ${CHOST} == *-darwin* ]] ; then - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die - - if use python ; then - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die - install_name_tool \ - -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die - - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die - install_name_tool \ - -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die - - install_name_tool \ - -change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ - "${D}"$(python_get_sitedir)/talloc*.bundle || die - install_name_tool \ - -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${D}"$(python_get_sitedir)/talloc*.bundle || die - fi - fi -} diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest index 77e89cadc42c..8a0e4bb4347c 100644 --- a/sys-libs/tdb/Manifest +++ b/sys-libs/tdb/Manifest @@ -1,3 +1,3 @@ DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a EBUILD tdb-1.4.3.ebuild 1390 BLAKE2B dd53828ff444e148af6dca3f49e3ebda352539e6d6eefa343150159d856ac7c3696e7974a479f4b5aeff96bae69dc66b89c0b57a0b132a772531787ec7c7b8cb SHA512 be7b77a732c8d106dc013e7a1d3b4c51f0c0226cad7fccd14c3886e91ada643bc9c5adf1549315ce008ffc45c2d3191ada3d47ad47accdd99753365f907f2fc7 -MISC metadata.xml 356 BLAKE2B 89cee65fc3e653bd568f34339d7d5e4ca0486ea124b175c88a966dde42a4128789669f2e0179e8d3ee2e4eb3df90f9de95441c3f2d61f3bdf47c1d87c95e1248 SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb +MISC metadata.xml 244 BLAKE2B d1692c5795a32dd5189e7374f1821bb98cd9efe798e851c04aab69aeab42c100e910d7a4532757f9f83bf1b345aa8e7adcfb3b6dba412dda8d4796313b833958 SHA512 d5cb5e719f70141aa6d7783bb63ebfd6158e9af82700041559c92ed45c688c6162b19a3d1ece204c9bf6cd92f2e7513ef8cc780bd442b312a9a3650a0232a34b diff --git a/sys-libs/tdb/metadata.xml b/sys-libs/tdb/metadata.xml index f0c4a5fed2f9..4c688eb03d5b 100644 --- a/sys-libs/tdb/metadata.xml +++ b/sys-libs/tdb/metadata.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>samba@gentoo.org</email> <name>Samba</name> </maintainer> diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest index 0197ec2806a9..8cd97db136cd 100644 --- a/sys-libs/tevent/Manifest +++ b/sys-libs/tevent/Manifest @@ -1,3 +1,3 @@ DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba EBUILD tevent-0.10.2.ebuild 1623 BLAKE2B 454a90d64c58f9007774de91e3156791206da74101d3f459ab62c617691d9cc133b03f48d3bcdc8c1849c89669d62cdf650f3591be8271b0b2cb2db15b034290 SHA512 851b32b81404c903406fa697109815d473228d0e0a2e23b24304d24f47822fda5c02959370a98552737e37735ef2c26bc37ff9a8ae9ce6a34e2a90b3ab1308af -MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5 +MISC metadata.xml 238 BLAKE2B d8df54241ec3e8c56cd49149dcf4a8eef0eefcd7eacce01bb0f1d5dcdc492b45d25f9388caf582e979dc9eb283ba88b8ab5ee28812072280566b797180eb649e SHA512 f8a66c9ca8ad8a98b25a6f0280652c9262ae5c23cc9cf813bd304722b80e404585689a9b618de7f3d57be64ec28e83d9aa8b84036dcdb2a91117f454b1ef7e93 diff --git a/sys-libs/tevent/metadata.xml b/sys-libs/tevent/metadata.xml index 00dd5f380b4d..6a21123323aa 100644 --- a/sys-libs/tevent/metadata.xml +++ b/sys-libs/tevent/metadata.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>samba@gentoo.org</email> <name>Samba</name> </maintainer> diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index fd026cfa8259..3bf83283fc78 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -3,6 +3,5 @@ AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 -EBUILD zlib-1.2.11-r3.ebuild 4156 BLAKE2B 068f32e1a9d540d3e7d21b882e58ccf96eec11f22ce2c45234e9ab5817da23fbc54c58e9a47e613199e5f6a6a7f0103e18edd3624ae4dc1d83d7c934835a620c SHA512 029f420cee843bbdbb3f1831e435f383f42fc5d2e563d9ca5e6f4fc47070f34ab4d7827f297c869a5fd0192e997e9c4577f0c0a993f99d7414c6b75b8a993a6e -EBUILD zlib-1.2.11-r4.ebuild 4212 BLAKE2B 9f33d6e40ce2511f812f415187f07565fce8d3c64badb70a59e6b76089d1c0836a5db12b4ef42761df758caf30a6083cc1ff5737346115634d899c3eeffe50bf SHA512 c79411f1bfb99196aba66d060968c51f0565fe9f8b3969fede6e7aa3721bd534badbbb7de523ad32dcaccd64e030fab7a182de0dee65a6bd15282a5705b97f35 +EBUILD zlib-1.2.11-r4.ebuild 4204 BLAKE2B ec6dbf321e9cfcfd555387469f0513b3ce13fef99b0a3710beff97621edd61568da20656eb8f8fee0b152d2928d60bca32e63fff090dbf492e237b6470a8e9b0 SHA512 53969ab5f1d09798445176e103abc9b1d58f72072caed38adf09db94cd692b9841cd39f4c19400d1873e07dc024cc6a5aa7e220ecc0e831bcd148857607cd383 MISC metadata.xml 493 BLAKE2B 56454cd42e326bbf6d5b6c535cfcf49edeaadf748d7b7c2956dbabebf32a1372800c3bc5442b28ef1f153c846475f77f24ee0256f34f038d5903166e0cd4612d SHA512 fbf724610d52699ef2cbc59870fb09e786df2dc36f4c89955d12460a11070a153dc2bda31f4c9d207dba08638eaa965d359b20fce90d401528cb67f3947e3a60 diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild deleted file mode 100644 index cd37e9b956af..000000000000 --- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -AUTOTOOLS_AUTO_DEPEND="no" -inherit autotools multilib-minimal usr-ldscript - -CYGWINPATCHES=( - "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch" - "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch" -) - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="https://zlib.net/" -SRC_URI="https://zlib.net/${P}.tar.gz - http://www.gzip.org/zlib/${P}.tar.gz - http://www.zlib.net/current/beta/${P}.tar.gz - elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -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 ~x86-winnt" -IUSE="minizip static-libs" - -BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" -RDEPEND="!<dev-libs/libxml2-2.7.7" #309623 -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch - "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536 -) - -src_prepare() { - default - - if use elibc_Cygwin ; then - local p - for p in "${CYGWINPATCHES[@]}" ; do - # Strip out the "... -> " from the array - eapply -p2 "${DISTDIR}/${p#*> }" - done - fi - - if use minizip ; then - cd contrib/minizip || die - eautoreconf - fi - - case ${CHOST} in - *-cygwin*) - # do not use _wopen, is a mingw symbol only - sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die - # zlib1.dll is the mingw name, need cygz.dll - # cygz.dll is loaded by toolchain, put into subdir - sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die - ;; - esac - - case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) - # uses preconfigured Makefile rather than configure script - multilib_copy_sources - ;; - esac -} - -echoit() { echo "$@"; "$@"; } - -multilib_src_configure() { - case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) - ;; - *) - local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167 - local myconf=( - --shared - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - ${uname:+--uname=${uname}} - ) - # not an autoconf script, so can't use econf - echoit "${S}"/configure "${myconf[@]}" || die - ;; - esac - - if use minizip ; then - local minizipdir="contrib/minizip" - mkdir -p "${BUILD_DIR}/${minizipdir}" || die - cd ${minizipdir} || die - ECONF_SOURCE="${S}/${minizipdir}" \ - econf $(use_enable static-libs static) - fi -} - -multilib_src_compile() { - case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- - sed \ - -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ - -e 's|@exec_prefix@|${prefix}|g' \ - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@includedir@|${prefix}/include|g' \ - -e 's|@VERSION@|'${PV}'|g' \ - zlib.pc.in > zlib.pc || die - ;; - *) - emake - ;; - esac - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # clean up namespace a little #383179 - # we do it here so we only have to tweak 2 files - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die -} - -multilib_src_install() { - case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) - emake -f win32/Makefile.gcc install \ - BINARY_PATH="${ED}/usr/bin" \ - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ - INCLUDE_PATH="${ED}/usr/include" \ - SHARED_MODE=1 - # overwrites zlib.pc created from win32/Makefile.gcc #620136 - insinto /usr/$(get_libdir)/pkgconfig - doins zlib.pc - ;; - - *) - emake install DESTDIR="${D}" LDCONFIG=: - gen_usr_ldscript -a z - ;; - esac - sed_macros "${ED}"/usr/include/*.h - - if use minizip ; then - emake -C contrib/minizip install DESTDIR="${D}" - sed_macros "${ED}"/usr/include/minizip/*.h - fi - - if ! use static-libs ; then - rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} || die #419645 - fi -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - use minizip && dodoc contrib/minizip/*.txt -} diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild index 2a1bea3fe2ce..5dfe56381a95 100644 --- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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 ~x86-winnt" +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 ~x86-winnt" IUSE="minizip static-libs" BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" |